diff options
| author | Don Venable <venabled@users.noreply.github.com> | 2020-05-08 16:57:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 13:57:24 -0700 |
| commit | 58560e53d85b2491b5c9c23da5e7b8547478c9a5 (patch) | |
| tree | b7668b23efd4f3251bce81d4015759bca0e095b0 | |
| parent | 18ab20050cc8580a3f47aeaa5d35f24f3a87bd76 (diff) | |
| download | vcpkg-58560e53d85b2491b5c9c23da5e7b8547478c9a5.tar.gz vcpkg-58560e53d85b2491b5c9c23da5e7b8547478c9a5.zip | |
[opencv2,opencv3,opencv4] Changed dependency on qt5 to qt5-base, fixes #11138 (#11201)
* Changed dependency on qt5 to qt5-base, closes microsoft/vcpkg#11138
* Bump the correct control file.
* Also added qt5-base as dep for opencv3, bumped version
* Changed dep for `qt` feature from `qt5` to `qt5-base`, bumped ver
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/opencv2/CONTROL | 4 | ||||
| -rw-r--r-- | ports/opencv3/CONTROL | 4 | ||||
| -rw-r--r-- | ports/opencv4/CONTROL | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ports/opencv2/CONTROL b/ports/opencv2/CONTROL index c2bb6ff60..707970258 100644 --- a/ports/opencv2/CONTROL +++ b/ports/opencv2/CONTROL @@ -1,5 +1,5 @@ Source: opencv2 -Version: 2.4.13.7 +Version: 2.4.13.7-1 Build-Depends: zlib Description: computer vision library, version 2 Default-Features: eigen, jpeg, opengl, png, tiff @@ -37,7 +37,7 @@ Build-Depends: libpng Description: PNG support for opencv Feature: qt -Build-Depends: qt5 +Build-Depends: qt5-base Description: Qt GUI support for opencv Feature: tiff diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL index a59ea896b..11e18f4f9 100644 --- a/ports/opencv3/CONTROL +++ b/ports/opencv3/CONTROL @@ -1,5 +1,5 @@ Source: opencv3 -Version: 3.4.7-2 +Version: 3.4.7-3 Build-Depends: protobuf, zlib Homepage: https://github.com/opencv/opencv Description: computer vision library @@ -63,7 +63,7 @@ Build-Depends: libpng Description: PNG support for opencv Feature: qt -Build-Depends: qt5 +Build-Depends: qt5-base Description: Qt GUI support for opencv Feature: sfm diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL index 6ffd8c699..4d5203b69 100644 --- a/ports/opencv4/CONTROL +++ b/ports/opencv4/CONTROL @@ -1,5 +1,5 @@ Source: opencv4 -Version: 4.1.1-4 +Version: 4.1.1-5 Build-Depends: protobuf, zlib Homepage: https://github.com/opencv/opencv Description: computer vision library @@ -66,7 +66,7 @@ Build-Depends: libpng Description: PNG support for opencv Feature: qt -Build-Depends: qt5 +Build-Depends: qt5-base Description: Qt GUI support for opencv Feature: sfm |