Skip to content

Commit

Permalink
[opencv2,opencv3,opencv4] Changed dependency on qt5 to qt5-base, fixes
Browse files Browse the repository at this point in the history
…#11138 (#11201)

* Changed dependency on qt5 to qt5-base, closes #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>
  • Loading branch information
venabled and BillyONeal authored May 8, 2020
1 parent 18ab200 commit 58560e5
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ports/opencv2/CONTROL
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ports/opencv3/CONTROL
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ports/opencv4/CONTROL
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 58560e5

Please sign in to comment.