diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-01-29 04:23:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 19:23:57 -0800 |
| commit | eb044d1eb5250a79c94c86f6157e034627f7628b (patch) | |
| tree | 591c88640d8ee5ef61f1d3e417db9b639651e7b0 /versions | |
| parent | 2eece71f53de6f9a83d2b686b8adceb40100a134 (diff) | |
| download | vcpkg-eb044d1eb5250a79c94c86f6157e034627f7628b.tar.gz vcpkg-eb044d1eb5250a79c94c86f6157e034627f7628b.zip | |
[OpenCV] bump to 4.5.1 and to 3.4.13 (#15859)
* [OpenCV] bump to 4.5.1 and to 3.4.13
* [OpenCV] fix patches
* [OpenCV] fix hdf5 integration
* [OpenCV] devendor quirc
* fix quirc for downstream ports
* [quirc] fix target export
* update version refs
* [OpenMVG] fix regressions with new opencv
* update version refs
* fix quirc mismatch
* update version refs
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/baseline.json | 12 | ||||
| -rw-r--r-- | versions/o-/opencv.json | 5 | ||||
| -rw-r--r-- | versions/o-/opencv3.json | 7 | ||||
| -rw-r--r-- | versions/o-/opencv4.json | 7 | ||||
| -rw-r--r-- | versions/o-/openmvg.json | 5 |
5 files changed, 28 insertions, 8 deletions
diff --git a/versions/baseline.json b/versions/baseline.json index 31bcaa013..f3a0bff9f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4233,7 +4233,7 @@ "port-version": 0 }, "opencv": { - "baseline": "4.5.0", + "baseline": "4.5.1", "port-version": 0 }, "opencv2": { @@ -4241,12 +4241,12 @@ "port-version": 5 }, "opencv3": { - "baseline": "3.4.12", - "port-version": 1 + "baseline": "3.4.13", + "port-version": 0 }, "opencv4": { - "baseline": "4.5.0", - "port-version": 1 + "baseline": "4.5.1", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.0", @@ -4290,7 +4290,7 @@ }, "openmvg": { "baseline": "1.6", - "port-version": 0 + "port-version": 1 }, "openmvs": { "baseline": "1.1", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index a428c254d..94d547250 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "5095d4c281b1fa2afc8398bfc61a88dc1e96e7e6", + "version": "4.5.1", + "port-version": 0 + }, + { "git-tree": "457db123c6f787763d2bbe056e51caecd8c37464", "version": "4.5.0", "port-version": 0 diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index b04a8ae26..9667226d7 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "ffd8270ed4798f25f3bd882a6089c72e86803466", + "git-tree": "4b65e217d97307583039d4324cd32488347cc344", + "version": "3.4.13", + "port-version": 0 + }, + { + "git-tree": "859d6618f0ff394cc940ede79ada4bff1b7655dc", "version": "3.4.12", "port-version": 1 }, diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index f6e5d8fe8..631be40cf 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "a0522dbbb44877b9d4618bfe31a376e07e49bc72", + "git-tree": "ba505df8f61764e9b4667b04958c748237d12d23", + "version": "4.5.1", + "port-version": 0 + }, + { + "git-tree": "ba164060f8a9e69ccc4c484a24b5e8085d20b3bd", "version": "4.5.0", "port-version": 1 }, diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json index 57b940750..8628d35ee 100644 --- a/versions/o-/openmvg.json +++ b/versions/o-/openmvg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "77b221e020b37ab1119a01536d5b4fe6836af4fd", + "version-string": "1.6", + "port-version": 1 + }, + { "git-tree": "0bc383c92d6341f46ad2250f956d0731e617d9ee", "version-string": "1.6", "port-version": 0 |