[OpenCV 3] update to v3.4.7 (#7658)

* [opencv3] uniform CONTROL file with opencv4 port

* [opencv3] uniform portfile with opencv4

* [opencv3] uniform CONTROL file with opencv4 port

* [opencv3] update to 3.4.7 draft

* [OpenCV 3] wip to uniform port to opencv4 standards

* [OpenCV3] fix IPPICV integration, use the same mechanism as in OpenCV4 port

* [OpenCV3] fix sfm module

* [OpenCV3] update hunk references in patches 0001 and 0009

* [OpenCV3] refresh install options to adhere to opencv4 standards

* [opencv3] remove leftovers

* [opencv3] Use OUT_FEATURE_OPTIONS with vcpkg_check_features()

1 files changed, 54 insertions, 53 deletions

diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL
index f70d1d387..d564e24a8 100644
--- a/ports/opencv3/CONTROL
+++ b/ports/opencv3/CONTROL
@@ -1,86 +1,90 @@
 Source: opencv3
-Version: 3.4.3-10
-Build-Depends: zlib
+Version: 3.4.7
+Build-Depends: protobuf, zlib
 Homepage: https://github.com/opencv/opencv
 Description: computer vision library
-Default-Features: opengl, jpeg, png, tiff, eigen, flann
+Default-Features: dnn, jpeg, opengl, png, tiff, webp
 
-Feature: opengl
-Build-Depends: opengl
-Description: opengl support for opencv
-
-Feature: dnn
-Build-Depends: protobuf
-Description: opencv_dnn module
-
-Feature: ovis
-Build-Depends: ogre
-Description: opencv_ovis module
+Feature: nonfree
+Description: allow nonfree and unredistributable libraries
 
 Feature: flann
 Description: opencv_flann module
 
-Feature: sfm
-Build-Depends: eigen3, glog, gflags, ceres
-Description: opencv_sfm module
-
 Feature: contrib
-Build-Depends: opencv3[flann]
+Build-Depends: hdf5 (!uwp)
 Description: opencv_contrib module
 
 Feature: cuda
-Build-Depends: cuda
+Build-Depends: opencv3[contrib], cuda
 Description: CUDA support for opencv
 
-Feature: ffmpeg
-Description: prebuilt ffmpeg support for opencv
-
-Feature: ipp
-Description: Enable Intel Integrated Performance Primitives
-
-Feature: tbb
-Build-Depends: tbb
-Description: Enable Intel Threading Building Blocks
+Feature: dnn
+Description: Enable dnn module
 
-Feature: qt
-Build-Depends: qt5
-Description: Qt GUI support for opencv
+Feature: eigen
+Build-Depends: eigen3
+Description: Eigen support for opencv
 
-Feature: vtk
-Build-Depends: vtk
-Description: vtk support for opencv
+Feature: ffmpeg
+Build-Depends: ffmpeg
+Description: ffmpeg support for opencv
 
 Feature: gdcm
 Build-Depends: gdcm
 Description: GDCM support for opencv
 
-Feature: webp
-Build-Depends: libwebp
-Description: WebP support for opencv
+Feature: ipp
+Description: Enable Intel Integrated Performance Primitives
+
+Feature: jasper
+Build-Depends: jasper
+Description: JPEG 2000 support for opencv
+
+Feature: jpeg
+Build-Depends: libjpeg-turbo
+Description: JPEG support for opencv
 
 Feature: openexr
 Build-Depends: openexr
 Description: OpenEXR support for opencv
 
-Feature: tiff
-Build-Depends: tiff
-Description: TIFF support for opencv
+Feature: opengl
+Build-Depends: opengl
+Description: opengl support for opencv
+
+
+Feature: ovis
+Build-Depends: opencv3[contrib], ogre
+Description: opencv_ovis module
 
 Feature: png
 Build-Depends: libpng
 Description: PNG support for opencv
 
-Feature: jpeg
-Build-Depends: libjpeg-turbo
-Description: JPEG support for opencv
+Feature: qt
+Build-Depends: qt5
+Description: Qt GUI support for opencv
 
-Feature: jasper
-Build-Depends: jasper
-Description: JPEG 2000 support for opencv
+Feature: sfm
+Build-Depends: opencv3[contrib], opencv3[flann], eigen3, glog, gflags, ceres
+Description: opencv_sfm module
 
-Feature: eigen
-Build-Depends: eigen3
-Description: Eigen support for opencv
+Feature: tbb
+Build-Depends: tbb
+Description: Enable Intel Threading Building Blocks
+
+Feature: tiff
+Build-Depends: tiff
+Description: TIFF support for opencv
+
+Feature: vtk
+Build-Depends: vtk
+Description: vtk support for opencv
+
+Feature: webp
+Build-Depends: libwebp
+Description: WebP support for opencv
 
 Feature: halide
 Build-Depends: halide, opencv3[core], opencv3[dnn]
@@ -88,6 +92,3 @@ Description: Halide support for opencv
 
 Feature: world
 Description: Compile to a single package support for opencv
-
-Feature: nonfree
-Description: allow nonfree and unredistributable libraries