From cdab71bd631228fbd2de66ec074968d43e5920ea Mon Sep 17 00:00:00 2001 From: Donald Venable Date: Wed, 6 May 2020 13:40:19 -0400 Subject: [PATCH 1/4] Changed dependency on qt5 to qt5-base, closes microsoft/vcpkg#11138 --- ports/opencv4/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL index 6ffd8c69958688..45a146ee42e39b 100644 --- a/ports/opencv4/CONTROL +++ b/ports/opencv4/CONTROL @@ -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 From 0b643c633df2b920d6a255ee5492018fff3fe3de Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Thu, 7 May 2020 11:21:59 -0700 Subject: [PATCH 2/4] Bump the correct control file. --- ports/opencv4/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL index 45a146ee42e39b..4d5203b69522cb 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 From 5961a3f5a15f7a9f659bd11e888d7397d1dcd80f Mon Sep 17 00:00:00 2001 From: Donald Venable Date: Thu, 7 May 2020 14:37:24 -0400 Subject: [PATCH 3/4] Also added qt5-base as dep for opencv3, bumped version --- ports/opencv3/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL index a59ea896bd6972..11e18f4f958ed4 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 From 3b583d55c4915727bef999ce6836f4cbfcf5dac4 Mon Sep 17 00:00:00 2001 From: Donald Venable Date: Thu, 7 May 2020 15:55:39 -0400 Subject: [PATCH 4/4] Changed dep for `qt` feature from `qt5` to `qt5-base`, bumped ver --- ports/opencv2/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/opencv2/CONTROL b/ports/opencv2/CONTROL index c2bb6ff60d6e53..70797025861c94 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