From d369df7ecf194005eaca46f07368779cd486badd 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: [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 --- 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 +++++ 8 files changed, 44 insertions(+), 9 deletions(-) (limited to 'versions') diff --git a/versions/a-/avisynthplus.json b/versions/a-/avisynthplus.json index 73c484393..c8cd5d877 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 d4c2879d5..88acf8925 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 1d13df614..29454476b 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 64104cebb..16b6862f6 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 3237895a2..2294e2eb7 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 ccae06e95..f22ce4aeb 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 c4a29965f..36e684e44 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 0b1778c5c..1a528ef23 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", -- cgit v1.2.3