Merge pull request #1 from Microsoft/master

Update vcpkg from upstream

11 files changed, 676 insertions, 207 deletions

diff --git a/ports/opencv/0001-winrt-fixes.patch b/ports/opencv/0001-winrt-fixes.patch
new file mode 100644
index 000000000..f913d92a4
--- /dev/null
+++ b/ports/opencv/0001-winrt-fixes.patch
@@ -0,0 +1,61 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -311,7 +311,7 @@ OCV_OPTION(INSTALL_TESTS            "Install accuracy and performance test binar
+ # OpenCV build options
+ # ===================================================
+ OCV_OPTION(ENABLE_CCACHE              "Use ccache"                                               (UNIX AND NOT IOS AND (CMAKE_GENERATOR MATCHES "Makefile" OR CMAKE_GENERATOR MATCHES "Ninja")) )
+-OCV_OPTION(ENABLE_PRECOMPILED_HEADERS "Use precompiled headers"                                  ON IF (NOT IOS AND NOT CMAKE_CROSSCOMPILING) )
++OCV_OPTION(ENABLE_PRECOMPILED_HEADERS "Use precompiled headers"                                  ON IF (NOT IOS AND (MSVC OR NOT CMAKE_CROSSCOMPILING)) )
+ OCV_OPTION(ENABLE_SOLUTION_FOLDERS    "Solution folder in Visual Studio or in other IDEs"        (MSVC_IDE OR CMAKE_GENERATOR MATCHES Xcode) )
+ OCV_OPTION(ENABLE_PROFILING           "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF  IF CMAKE_COMPILER_IS_GNUCXX )
+ OCV_OPTION(ENABLE_COVERAGE            "Enable coverage collection with  GCov"                    OFF  IF CMAKE_COMPILER_IS_GNUCXX )
+--- a/cmake/OpenCVModule.cmake
++++ b/cmake/OpenCVModule.cmake
+@@ -842,7 +842,7 @@ macro(ocv_create_module)
+     set(the_module_target ${the_module})
+   endif()
+
+-  if(WINRT)
++  if(WINRT AND BUILD_TESTS)
+     # removing APPCONTAINER from modules to run from console
+     # in case of usual starting of WinRT test apps output is missing
+     # so starting of console version w/o APPCONTAINER is required to get test results
+--- a/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp
++++ b/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp
+@@ -24,6 +24,7 @@
+ // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ // POSSIBILITY OF SUCH DAMAGE.
+
++#include "opencv2/core/cvdef.h"
+ using namespace Windows::UI::Xaml::Controls;
+
+ namespace cv
+diff --git a/modules/highgui/src/window_winrt_bridge.hpp b/modules/highgui/src/window_winrt_bridge.hpp
+index 25f4aef..5429f0b 100644
+--- a/modules/highgui/src/window_winrt_bridge.hpp
++++ b/modules/highgui/src/window_winrt_bridge.hpp
+@@ -28,6 +28,7 @@
+
+ #include <map>
+ #include <opencv2\core.hpp>
++#include "opencv2/highgui/highgui_c.h"
+
+ using namespace Windows::UI::Xaml::Controls;
+
+diff --git a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp
+index 236e227..e2417dc 100644
+--- a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp
++++ b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp
+@@ -94,10 +94,10 @@ Media::CaptureFrameGrabber::~CaptureFrameGrabber()
+
+ void Media::CaptureFrameGrabber::ShowCameraSettings()
+ {
+-#if WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP
++#if (WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP) && (WINAPI_FAMILY!=WINAPI_FAMILY_APP)
+     if (_state == State::Started)
+     {
+-        CameraOptionsUI::Show(_capture.Get());
++        CameraOptionsUI::Show(_capture.Get()); // TODO: Turn it on again in UWP mode by adding reference to UWP Desktop Extensions
+     }
+ #endif
+ }
diff --git a/ports/opencv/opencv-installation-options.patch b/ports/opencv/0002-install-options.patch
index cfb401836..830c9f385 100644
--- a/ports/opencv/opencv-installation-options.patch
+++ b/ports/opencv/0002-install-options.patch
@@ -1,8 +1,6 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cc45f6f..b4265bd 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -263,6 +263,10 @@ OCV_OPTION(INSTALL_PYTHON_EXAMPLES  "Install Python examples"   OFF )
+@@ -307,6 +307,10 @@ OCV_OPTION(INSTALL_PYTHON_EXAMPLES  "Install Python examples"   OFF )
  OCV_OPTION(INSTALL_ANDROID_EXAMPLES "Install Android examples"  OFF IF ANDROID )
  OCV_OPTION(INSTALL_TO_MANGLED_PATHS "Enables mangled install paths, that help with side by side installs." OFF IF (UNIX AND NOT ANDROID AND NOT APPLE_FRAMEWORK AND BUILD_SHARED_LIBS) )
  OCV_OPTION(INSTALL_TESTS            "Install accuracy and performance test binaries and test data" OFF)
@@ -10,12 +8,21 @@ index cc45f6f..b4265bd 100644
 +OCV_OPTION(INSTALL_LICENSE          "Install license file"      ON)
 +OCV_OPTION(INSTALL_OTHER            "Install other files"       ON)
 +OCV_OPTION(INSTALL_FORCE_UNIX_PATHS "Force unix-style installation" OFF)
- 
+
  # OpenCV build options
  # ===================================================
-@@ -330,7 +334,9 @@ else()
+@@ -335,7 +339,7 @@ OCV_OPTION(CV_ENABLE_INTRINSICS       "Use intrinsic-based optimized code" ON )
+ OCV_OPTION(CV_DISABLE_OPTIMIZATION    "Disable explicit optimized code (dispatched code/intrinsics/loop unrolling/etc)" OFF )
+ OCV_OPTION(CV_TRACE                   "Enable OpenCV code trace" ON)
+
+-OCV_OPTION(ENABLE_PYLINT              "Add target with Pylint checks"                            (${BUILD_DOCS} OR ${BUILD_EXAMPLES}) IF (NOT CMAKE_CROSSCOMPILING AND NOT APPLE_FRAMEWORK) )
++OCV_OPTION(ENABLE_PYLINT              "Add target with Pylint checks"                            (BUILD_DOCS OR BUILD_EXAMPLES) IF (NOT CMAKE_CROSSCOMPILING AND NOT APPLE_FRAMEWORK) )
+
+ if(ENABLE_IMPL_COLLECTION)
+   add_definitions(-DCV_COLLECT_IMPL_DATA)
+@@ -372,7 +376,9 @@ else()
  endif()
- 
+
  if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
 -  if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
 +  if(DEFINED OpenCV_DISABLE_ARCH_PATH)
@@ -24,29 +31,42 @@ index cc45f6f..b4265bd 100644
      ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
    else()
      message(STATUS "Can't detect runtime and/or arch")
-@@ -784,7 +790,7 @@ if(NOT OPENCV_LICENSE_FILE)
+@@ -427,12 +433,8 @@ else()
+   ocv_update(3P_LIBRARY_OUTPUT_PATH      "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}")
+
+   if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+-    if(OpenCV_STATIC)
+-      ocv_update(OPENCV_LIB_INSTALL_PATH   "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}")
+-    else()
+-      ocv_update(OPENCV_LIB_INSTALL_PATH   "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}")
+-    endif()
+-    ocv_update(OPENCV_3P_LIB_INSTALL_PATH  "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}")
++    ocv_update(OPENCV_LIB_INSTALL_PATH     "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}")
++    ocv_update(OPENCV_3P_LIB_INSTALL_PATH  "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}")
+     ocv_update(OPENCV_SAMPLES_SRC_INSTALL_PATH    samples)
+     ocv_update(OPENCV_JAR_INSTALL_PATH java)
+     ocv_update(OPENCV_OTHER_INSTALL_PATH   etc)
+@@ -895,7 +897,7 @@ if(NOT OPENCV_LICENSE_FILE)
  endif()
- 
+
  # for UNIX it does not make sense as LICENSE and readme will be part of the package automatically
 -if(ANDROID OR NOT UNIX)
 +if(ANDROID OR NOT UNIX AND INSTALL_LICENSE)
    install(FILES ${OPENCV_LICENSE_FILE}
          PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
          DESTINATION ./ COMPONENT libs)
-diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
-index 206acfd..b4c223e 100644
 --- a/cmake/OpenCVGenConfig.cmake
 +++ b/cmake/OpenCVGenConfig.cmake
-@@ -91,7 +91,7 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
+@@ -105,7 +105,7 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
    endif()
  endfunction()
- 
--if(UNIX AND NOT ANDROID)
-+if((UNIX AND NOT ANDROID) OR INSTALL_FORCE_UNIX_PATHS)
+
+-if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID)
++if(((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID) OR INSTALL_FORCE_UNIX_PATHS)
    ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "")
  endif()
- 
-@@ -103,7 +103,7 @@ endif()
+
+@@ -117,7 +117,7 @@ endif()
  # --------------------------------------------------------------------------------------------
  #  Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake  -> For use within binary installers/packages
  # --------------------------------------------------------------------------------------------
@@ -55,8 +75,6 @@ index 206acfd..b4c223e 100644
    if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
      if(BUILD_SHARED_LIBS)
        set(_lib_suffix "lib")
-diff --git a/cmake/OpenCVGenHeaders.cmake b/cmake/OpenCVGenHeaders.cmake
-index 2988979..810871b 100644
 --- a/cmake/OpenCVGenHeaders.cmake
 +++ b/cmake/OpenCVGenHeaders.cmake
 @@ -1,7 +1,9 @@
@@ -67,51 +85,45 @@ index 2988979..810871b 100644
 +if(INSTALL_HEADERS)
 +  install(FILES "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/cvconfig.h" DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2 COMPONENT dev)
 +endif()
- 
- # ----------------------------------------------------------------------------
- #  opencv_modules.hpp based on actual modules list
-@@ -25,4 +27,6 @@ set(OPENCV_MODULE_DEFINITIONS_CONFIGMAKE "${OPENCV_MODULE_DEFINITIONS_CONFIGMAKE
+
+ # platform-specific config file
+ ocv_compiler_optimization_fill_cpu_config()
+@@ -29,4 +31,6 @@ set(OPENCV_MODULE_DEFINITIONS_CONFIGMAKE "${OPENCV_MODULE_DEFINITIONS_CONFIGMAKE
  #endforeach()
- 
+
  configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/opencv_modules.hpp.in" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/opencv2/opencv_modules.hpp")
 -install(FILES "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/opencv2/opencv_modules.hpp" DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2 COMPONENT dev)
 +if(INSTALL_HEADERS)
 +  install(FILES "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/opencv2/opencv_modules.hpp" DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2 COMPONENT dev)
 +endif()
-diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
-index 742a287..c8242dd 100644
 --- a/cmake/OpenCVModule.cmake
 +++ b/cmake/OpenCVModule.cmake
-@@ -880,7 +880,9 @@ macro(_ocv_create_module)
-       foreach(hdr ${OPENCV_MODULE_${m}_HEADERS})
-         string(REGEX REPLACE "^.*opencv2/" "opencv2/" hdr2 "${hdr}")
-         if(NOT hdr2 MATCHES "opencv2/${m}/private.*" AND hdr2 MATCHES "^(opencv2/?.*)/[^/]+.h(..)?$" )
--          install(FILES ${hdr} OPTIONAL DESTINATION "${OPENCV_INCLUDE_INSTALL_PATH}/${CMAKE_MATCH_1}" COMPONENT dev)
-+          if(INSTALL_HEADERS)
-+            install(FILES ${hdr} OPTIONAL DESTINATION "${OPENCV_INCLUDE_INSTALL_PATH}/${CMAKE_MATCH_1}" COMPONENT dev)
-+          endif()
-         endif()
-       endforeach()
-     endif()
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index 1f0d720..86b9d89 100644
+@@ -994,7 +994,9 @@ macro(_ocv_create_module)
+     foreach(hdr ${OPENCV_MODULE_${the_module}_HEADERS})
+       string(REGEX REPLACE "^.*opencv2/" "opencv2/" hdr2 "${hdr}")
+       if(NOT hdr2 MATCHES "private" AND hdr2 MATCHES "^(opencv2/?.*)/[^/]+.h(..)?$" )
+-        install(FILES ${hdr} OPTIONAL DESTINATION "${OPENCV_INCLUDE_INSTALL_PATH}/${CMAKE_MATCH_1}" COMPONENT dev)
++        if(INSTALL_HEADERS)
++          install(FILES ${hdr} OPTIONAL DESTINATION "${OPENCV_INCLUDE_INSTALL_PATH}/${CMAKE_MATCH_1}" COMPONENT dev)
++        endif()
+       endif()
+     endforeach()
+   endif()
 --- a/data/CMakeLists.txt
 +++ b/data/CMakeLists.txt
 @@ -1,8 +1,10 @@
  file(GLOB HAAR_CASCADES haarcascades/*.xml)
  file(GLOB LBP_CASCADES lbpcascades/*.xml)
- 
+
 -install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs)
 -install(FILES ${LBP_CASCADES}  DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades  COMPONENT libs)
 +if(INSTALL_OTHER)
 +  install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs)
 +  install(FILES ${LBP_CASCADES}  DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades  COMPONENT libs)
 +endif()
- 
+
  if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH)
    install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests")
-diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
-index b4e48e6..d5ed455 100644
 --- a/include/CMakeLists.txt
 +++ b/include/CMakeLists.txt
 @@ -1,7 +1,9 @@
@@ -131,7 +143,3 @@ index b4e48e6..d5ed455 100644
 +        DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2
 +        COMPONENT dev)
 +endif()
-\ No newline at end of file
--- 
-2.9.0.windows.1
-
diff --git a/ports/opencv/0003-disable-downloading.patch b/ports/opencv/0003-disable-downloading.patch
new file mode 100644
index 000000000..28b00251f
--- /dev/null
+++ b/ports/opencv/0003-disable-downloading.patch
@@ -0,0 +1,11 @@
+--- a/cmake/OpenCVDownload.cmake
++++ b/cmake/OpenCVDownload.cmake
+@@ -151,6 +151,8 @@ function(ocv_download)
+   # Download
+   if(NOT EXISTS "${CACHE_CANDIDATE}")
+     ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
++    string(REPLACE "${OPENCV_DOWNLOAD_PATH}/" "opencv-cache/" CACHE_SUBPATH "${CACHE_CANDIDATE}")
++    message(FATAL_ERROR "    Downloads are not permitted during configure. Please pre-download the file \"${CACHE_CANDIDATE}\":\n    \n    vcpkg_download_distfile(OCV_DOWNLOAD\n        URLS \"${DL_URL}\"\n        FILENAME \"${CACHE_SUBPATH}\"\n        SHA512 0\n    )")
+     file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}"
+          INACTIVITY_TIMEOUT 60
+          TIMEOUT 600
diff --git a/ports/opencv/0004-use-find-package-required.patch b/ports/opencv/0004-use-find-package-required.patch
new file mode 100644
index 000000000..4e1daf659
--- /dev/null
+++ b/ports/opencv/0004-use-find-package-required.patch
@@ -0,0 +1,83 @@
+--- a/cmake/OpenCVFindLibsGrfmt.cmake
++++ b/cmake/OpenCVFindLibsGrfmt.cmake
+@@ -6,7 +6,7 @@
+ if(BUILD_ZLIB)
+   ocv_clear_vars(ZLIB_FOUND)
+ else()
+-  find_package(ZLIB "${MIN_VER_ZLIB}")
++  find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED)
+   if(ZLIB_FOUND AND ANDROID)
+     if(ZLIB_LIBRARIES MATCHES "/usr/(lib|lib32|lib64)/libz.so$")
+       set(ZLIB_LIBRARIES z)
+@@ -30,7 +30,7 @@ if(WITH_JPEG)
+   if(BUILD_JPEG)
+     ocv_clear_vars(JPEG_FOUND)
+   else()
+-    include(FindJPEG)
++    find_package(JPEG REQUIRED)
+   endif()
+
+   if(NOT JPEG_FOUND)
+@@ -51,7 +51,7 @@ if(WITH_TIFF)
+   if(BUILD_TIFF)
+     ocv_clear_vars(TIFF_FOUND)
+   else()
+-    include(FindTIFF)
++    find_package(TIFF REQUIRED)
+     if(TIFF_FOUND)
+       ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION)
+     endif()
+@@ -94,7 +94,7 @@ if(WITH_WEBP)
+   if(BUILD_WEBP)
+     ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR)
+   else()
+-    include(cmake/OpenCVFindWebP.cmake)
++    find_package(WebP REQUIRED)
+     if(WEBP_FOUND)
+       set(HAVE_WEBP 1)
+     endif()
+@@ -135,7 +135,7 @@ if(WITH_JASPER)
+   if(BUILD_JASPER)
+     ocv_clear_vars(JASPER_FOUND)
+   else()
+-    include(FindJasper)
++    find_package(Jasper REQUIRED)
+   endif()
+
+   if(NOT JASPER_FOUND)
+@@ -159,7 +159,7 @@ if(WITH_PNG)
+   if(BUILD_PNG)
+     ocv_clear_vars(PNG_FOUND)
+   else()
+-    include(FindPNG)
++    find_package(PNG REQUIRED)
+     if(PNG_FOUND)
+       include(CheckIncludeFile)
+       check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H)
+@@ -191,7 +191,7 @@ if(WITH_OPENEXR)
+   if(BUILD_OPENEXR)
+     ocv_clear_vars(OPENEXR_FOUND)
+   else()
+-    include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake")
++    find_package(OpenEXR REQUIRED)
+   endif()
+
+   if(NOT OPENEXR_FOUND)
+@@ -207,7 +207,7 @@ endif()
+
+ # --- GDAL (optional) ---
+ if(WITH_GDAL)
+-    find_package(GDAL QUIET)
++    find_package(GDAL REQUIRED)
+
+     if(NOT GDAL_FOUND)
+         set(HAVE_GDAL NO)
+@@ -219,7 +219,7 @@ if(WITH_GDAL)
+ endif()
+
+ if (WITH_GDCM)
+-  find_package(GDCM QUIET)
++  find_package(GDCM REQUIRED)
+   if(NOT GDCM_FOUND)
+     set(HAVE_GDCM NO)
+     ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES)
diff --git a/ports/opencv/0005-remove-protobuf-target.patch b/ports/opencv/0005-remove-protobuf-target.patch
new file mode 100644
index 000000000..b538ee040
--- /dev/null
+++ b/ports/opencv/0005-remove-protobuf-target.patch
@@ -0,0 +1,31 @@
+--- a/cmake/OpenCVFindProtobuf.cmake
++++ b/cmake/OpenCVFindProtobuf.cmake
+@@ -44,17 +44,6 @@ else()
+   # end of compatibility block
+ 
+   if(Protobuf_FOUND)
+-    if(TARGET protobuf::libprotobuf)
+-      add_library(libprotobuf INTERFACE)
+-      target_link_libraries(libprotobuf INTERFACE protobuf::libprotobuf)
+-    else()
+-      add_library(libprotobuf UNKNOWN IMPORTED)
+-      set_target_properties(libprotobuf PROPERTIES
+-        IMPORTED_LOCATION "${Protobuf_LIBRARY}"
+-        INTERFACE_INCLUDE_DIRECTORIES "${Protobuf_INCLUDE_DIR}"
+-      )
+-      get_protobuf_version(Protobuf_VERSION "${Protobuf_INCLUDE_DIR}")
+-    endif()
+     set(HAVE_PROTOBUF TRUE)
+   endif()
+ endif()
+--- a/modules/dnn/CMakeLists.txt
++++ b/modules/dnn/CMakeLists.txt
+@@ -65,7 +65,7 @@ endif()
+ 
+ ocv_module_include_directories(${fw_inc} ${CMAKE_CURRENT_LIST_DIR}/src/ocl4dnn/include ${OPENCL_INCLUDE_DIRS})
+ ocv_glob_module_sources(SOURCES ${fw_srcs})
+-ocv_create_module(libprotobuf ${LAPACK_LIBRARIES})
++ocv_create_module()
+ ocv_add_samples()
+ ocv_add_accuracy_tests()
+ ocv_add_perf_tests()
diff --git a/ports/opencv/001-fix-uwp.patch b/ports/opencv/001-fix-uwp.patch
deleted file mode 100644
index fa047ee4e..000000000
--- a/ports/opencv/001-fix-uwp.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
-index 0dcf7ed..c722a03 100644
---- "a/cmake/OpenCVCompilerOptions.cmake"
-+++ "b/cmake/OpenCVCompilerOptions.cmake"
-@@ -21,6 +21,9 @@ if(MSVC)
-     string(REPLACE "/EHsc" "/EHa" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}"  CACHE STRING "Flags used by the compiler during all build types." FORCE)
-   endif()
-+  if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW")
-+  endif()
- endif()
- 
- set(OPENCV_EXTRA_FLAGS "")
- diff --git "a/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp" "b/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp"
-index f4147f3..498f414 100644
---- "a/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp"
-+++ "b/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp"
-@@ -24,6 +24,8 @@
- // NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- // POSSIBILITY OF SUCH DAMAGE.
- 
-+#include "opencv2/core/cvdef.h"
-+
- using namespace Windows::UI::Xaml::Controls;
- 
- namespace cv
-diff --git "a/modules/highgui/src/window_winrt_bridge.hpp" "b/modules/highgui/src/window_winrt_bridge.hpp"
-index 25f4aef..5429f0b 100644
---- "a/modules/highgui/src/window_winrt_bridge.hpp"
-+++ "b/modules/highgui/src/window_winrt_bridge.hpp"
-@@ -28,6 +28,7 @@
- 
- #include <map>
- #include <opencv2\core.hpp>
-+#include "opencv2/highgui/highgui_c.h"
- 
- using namespace Windows::UI::Xaml::Controls;
- 
-diff --git "a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp" "b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp"
-index 236e227..9f5970e 100644
---- "a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp"
-+++ "b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp"
-@@ -94,10 +94,10 @@ Media::CaptureFrameGrabber::~CaptureFrameGrabber()
- 
- void Media::CaptureFrameGrabber::ShowCameraSettings()
- {
--#if WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP
-+#if (WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP) && (WINAPI_FAMILY!=WINAPI_FAMILY_APP)
-     if (_state == State::Started)
-     {
--        CameraOptionsUI::Show(_capture.Get());
-+        CameraOptionsUI::Show(_capture.Get()); // TODO: Turn it back by adding reference to UWP Desktop Extensions
-     }
- #endif
- }
- 
\ No newline at end of file
diff --git a/ports/opencv/002-fix-uwp.patch b/ports/opencv/002-fix-uwp.patch
deleted file mode 100644
index d684141f5..000000000
--- a/ports/opencv/002-fix-uwp.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b4265bd..f1621e0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -271,7 +271,7 @@ OCV_OPTION(INSTALL_FORCE_UNIX_PATHS "Force unix-style installation" OFF)
- # OpenCV build options
- # ===================================================
- OCV_OPTION(ENABLE_CCACHE              "Use ccache"                                               (UNIX AND NOT IOS AND (CMAKE_GENERATOR MATCHES "Makefile" OR CMAKE_GENERATOR MATCHES "Ninja")) )
--OCV_OPTION(ENABLE_PRECOMPILED_HEADERS "Use precompiled headers"                                  ON IF (NOT IOS AND NOT CMAKE_CROSSCOMPILING) )
-+OCV_OPTION(ENABLE_PRECOMPILED_HEADERS "Use precompiled headers"                                  ON IF (NOT IOS AND (MSVC OR NOT CMAKE_CROSSCOMPILING)) )
- OCV_OPTION(ENABLE_SOLUTION_FOLDERS    "Solution folder in Visual Studio or in other IDEs"        (MSVC_IDE OR CMAKE_GENERATOR MATCHES Xcode) )
- OCV_OPTION(ENABLE_PROFILING           "Enable profiling in the GCC compiler (Add flags: -g -pg)" OFF  IF CMAKE_COMPILER_IS_GNUCXX )
- OCV_OPTION(ENABLE_COVERAGE            "Enable coverage collection with  GCov"                    OFF  IF CMAKE_COMPILER_IS_GNUCXX )
-diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
-index c8242dd..97edd14 100644
---- a/cmake/OpenCVModule.cmake
-+++ b/cmake/OpenCVModule.cmake
-@@ -730,7 +730,7 @@ macro(ocv_create_module)
-     set(the_module_target ${the_module})
-   endif()
- 
--  if(WINRT)
-+  if(WINRT AND BUILD_TESTS)
-     # removing APPCONTAINER from modules to run from console
-     # in case of usual starting of WinRT test apps output is missing
-     # so starting of console version w/o APPCONTAINER is required to get test results
-diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp
-index 9306f8e..69a814e 100644
---- a/modules/highgui/src/window.cpp
-+++ b/modules/highgui/src/window.cpp
-@@ -209,7 +209,7 @@ int cv::waitKeyEx(int delay)
- int cv::waitKey(int delay)
- {
-     int code = waitKeyEx(delay);
--#ifndef HAVE_WINRT
-+#ifndef WINRT
-     static int use_legacy = -1;
-     if (use_legacy < 0)
-     {
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index 8da12f3d9..5450f3906 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -1,6 +1,78 @@
 Source: opencv
-Version: 3.2.0-1
-Build-Depends: zlib, libpng, libjpeg-turbo, tiff
-#Use the following line instead for optional features from OpenCV-contrib that require protobuf
-#Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf
+Version: 3.4.1
+Build-Depends: zlib
 Description: computer vision library
+Default-Features: opengl, jpeg, png, tiff, eigen, flann
+
+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: flann
+Description: opencv_flann module
+
+Feature: sfm
+Build-Depends: eigen3, glog, gflags, ceres
+Description: opencv_sfm module
+
+Feature: contrib
+Build-Depends: opencv[flann]
+Description: opencv_contrib module
+
+Feature: cuda
+Build-Depends: cuda
+Description: CUDA support for opencv
+
+Feature: ffmpeg
+Description: prebuilt ffmpeg support for opencv
+
+Feature: ipp
+Description: Enable Intel Integrated Performance Primitives
+
+Feature: qt
+Build-Depends: qt5
+Description: Qt GUI support for opencv
+
+Feature: vtk
+Build-Depends: vtk
+Description: vtk support for opencv
+
+Feature: gdcm
+Build-Depends: gdcm2
+Description: GDCM support for opencv
+
+Feature: webp
+Build-Depends: libwebp
+Description: WebP support for opencv
+
+Feature: openexr
+Build-Depends: openexr
+Description: OpenEXR support for opencv
+
+Feature: tiff
+Build-Depends: tiff
+Description: TIFF support for opencv
+
+Feature: png
+Build-Depends: libpng
+Description: PNG support for opencv
+
+Feature: jpeg
+Build-Depends: libjpeg-turbo
+Description: JPEG support for opencv
+
+Feature: jasper
+Build-Depends: jasper
+Description: JPEG 2000 support for opencv
+
+Feature: eigen
+Build-Depends: eigen3
+Description: Eigen support for opencv
diff --git a/ports/opencv/open_contrib-remove-waldboost.patch b/ports/opencv/open_contrib-remove-waldboost.patch
deleted file mode 100644
index 6c4da30ae..000000000
--- a/ports/opencv/open_contrib-remove-waldboost.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules/xobjdetect/CMakeLists.txt b/modules/xobjdetect/CMakeLists.txt
-index 567909b..2f30b41 100644
---- a/modules/xobjdetect/CMakeLists.txt
-+++ b/modules/xobjdetect/CMakeLists.txt
-@@ -1,5 +1,2 @@
- set(the_description "Object detection algorithms")
- ocv_define_module(xobjdetect opencv_core opencv_imgproc opencv_highgui opencv_objdetect WRAP python)
--if (NOT APPLE_FRAMEWORK)
--    add_subdirectory(tools)
--endif()
---
-2.12.0.windows.1
-
diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake
index c72eefba1..78ed5fa51 100644
--- a/ports/opencv/portfile.cmake
+++ b/ports/opencv/portfile.cmake
@@ -1,67 +1,313 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building not supported yet. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/opencv-3.2.0)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/opencv/opencv/archive/3.2.0.zip"
-    FILENAME "opencv-3.2.0.zip"
-    SHA512 c6418d2a7654fe9d50611e756778df4c6736f2de76b85773efbf490bb475dd95ec1041fe57a87163ce11a7db44430cd378c8416af3319f979ced92532bf5ebb5
+
+set(OPENCV_PORT_VERSION "3.4.1")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO opencv/opencv
+    REF ${OPENCV_PORT_VERSION}
+    SHA512 e1fc14285090c6fe9e26e721f2d67d7096650c523147e925567426ef76aa7f4c6f12035d6f6ce3ec7991a75a6828a810fd4f9b75f78ed5fcccecefbadd79944b
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/opencv-installation-options.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/001-fix-uwp.patch"
-            "${CMAKE_CURRENT_LIST_DIR}/002-fix-uwp.patch"
+    PATCHES
+      "${CMAKE_CURRENT_LIST_DIR}/0001-winrt-fixes.patch"
+      "${CMAKE_CURRENT_LIST_DIR}/0002-install-options.patch"
+      "${CMAKE_CURRENT_LIST_DIR}/0003-disable-downloading.patch"
+      "${CMAKE_CURRENT_LIST_DIR}/0004-use-find-package-required.patch"
+      "${CMAKE_CURRENT_LIST_DIR}/0005-remove-protobuf-target.patch"
 )
-file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/libjpeg ${SOURCE_PATH}/3rdparty/libpng ${SOURCE_PATH}/3rdparty/zlib ${SOURCE_PATH}/3rdparty/libtiff)
-
-# Uncomment the following lines and the lines under OPTIONS to build opencv_contrib
-# Important: after uncommenting you've add protobuf dependency within CONTROL file
-#SET(CONTRIB_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/opencv_contrib-3.2.0)
-#vcpkg_download_distfile(CONTRIB_ARCHIVE
-#    URLS "https://github.com/opencv/opencv_contrib/archive/3.2.0.zip"
-#    FILENAME "opencv_contrib-3.2.0.zip"
-#    SHA512 da6cda7a7ae1d722967e18f9b8d60895b93bbc3664dfdb1645cb4d8b337a9c4207b9073fd546a596c48a489f92d15191aa34c7c607167b536fbe4937b8424b43
-#)
-#vcpkg_extract_source_archive(${CONTRIB_ARCHIVE})
-#vcpkg_apply_patches(
-#    SOURCE_PATH ${CONTRIB_SOURCE_PATH}
-#    PATCHES "${CMAKE_CURRENT_LIST_DIR}/open_contrib-remove-waldboost.patch"
-#)
+
+file(WRITE "${CURRENT_BUILDTREES_DIR}/src/opencv-${OPENCV_PORT_VERSION}/rework.stamp")
+
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT)
+
+set(CMAKE_MODULE_PATH)
+
+set(BUILD_opencv_dnn OFF)
+set(WITH_PROTOBUF OFF)
+if("dnn" IN_LIST FEATURES)
+  set(BUILD_opencv_dnn ON)
+  set(WITH_PROTOBUF ON)
+  set(PROTOBUF_UPDATE_FILES ON)
+  set(UPDATE_PROTO_FILES ON)
+  vcpkg_download_distfile(TINYDNN_ARCHIVE
+    URLS "https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz"
+    FILENAME "opencv-cache/tiny_dnn/adb1c512e09ca2c7a6faef36f9c53e59-v1.0.0a3.tar.gz"
+    SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
+  )
+endif()
+
+set(BUILD_opencv_flann OFF)
+if("flann" IN_LIST FEATURES)
+  set(BUILD_opencv_flann ON)
+endif()
+
+set(BUILD_opencv_ovis OFF)
+if("ovis" IN_LIST FEATURES)
+  set(BUILD_opencv_ovis ON)
+endif()
+
+set(BUILD_opencv_sfm OFF)
+if("sfm" IN_LIST FEATURES)
+  set(BUILD_opencv_sfm ON)
+endif()
+
+set(BUILD_opencv_contrib OFF)
+if("contrib" IN_LIST FEATURES)
+  set(BUILD_opencv_contrib ON)
+
+  # Used for opencv's face module
+  vcpkg_download_distfile(OCV_DOWNLOAD
+    URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/8afa57abc8229d611c4937165d20e2a2d9fc5a12/face_landmark_model.dat"
+    FILENAME "opencv-cache/data/7505c44ca4eb54b4ab1e4777cb96ac05-face_landmark_model.dat"
+    SHA512 c16e60a6c4bb4de3ab39b876ae3c3f320ea56f69c93e9303bd2dff8760841dcd71be4161fff8bc71e8fe4fe8747fa8465d49d6bd8f5ebcdaea161f4bc2da7c93
+  )
+
+  vcpkg_download_distfile(TINYDNN_ARCHIVE
+    URLS "https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz"
+    FILENAME "opencv-cache/tiny_dnn/adb1c512e09ca2c7a6faef36f9c53e59-v1.0.0a3.tar.gz"
+    SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
+  )
+
+  function(download_opencv_3rdparty ID COMMIT HASH)
+    if(NOT EXISTS "${DOWNLOADS}/opencv-cache/${ID}/${COMMIT}.stamp")
+      vcpkg_download_distfile(OCV_DOWNLOAD
+          URLS "https://github.com/opencv/opencv_3rdparty/archive/${COMMIT}.zip"
+          FILENAME "opencv_3rdparty-${COMMIT}.zip"
+          SHA512 ${HASH}
+      )
+      vcpkg_extract_source_archive(${OCV_DOWNLOAD})
+      file(MAKE_DIRECTORY "${DOWNLOADS}/opencv-cache/${ID}")
+      file(GLOB XFEATURES2D_I ${CURRENT_BUILDTREES_DIR}/src/opencv_3rdparty-${COMMIT}/*)
+      foreach(FILE ${XFEATURES2D_I})
+        file(COPY ${FILE} DESTINATION "${DOWNLOADS}/opencv-cache/${ID}")
+        get_filename_component(XFEATURES2D_I_NAME "${FILE}" NAME)
+        file(MD5 "${FILE}" FILE_HASH)
+        file(RENAME "${DOWNLOADS}/opencv-cache/${ID}/${XFEATURES2D_I_NAME}" "${DOWNLOADS}/opencv-cache/${ID}/${FILE_HASH}-${XFEATURES2D_I_NAME}")
+      endforeach()
+      file(WRITE "${DOWNLOADS}/opencv-cache/${ID}/${COMMIT}.stamp")
+    endif()
+  endfunction()
+
+  # Used for opencv's xfeature2d module
+  download_opencv_3rdparty(
+    xfeatures2d/boostdesc
+    34e4206aef44d50e6bbcd0ab06354b52e7466d26
+    2ccdc8fb59da55eabc73309a80a4d3b1e73e2341027cdcdd2d714e0f519e60f243f38f79b13ed3de32f595aa23e4f86418eed42e741f32a81b1e6e0879190601
+  )
+
+  # Used for opencv's xfeature2d module
+  download_opencv_3rdparty(
+    xfeatures2d/vgg
+    fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d
+    7051f5d6ccb938d296b919dd6d5dcddc5afb527aed456639c9984276a8f64565c084d96a72499a7756f127f8d2b1ce9ab70e4cbb3f89c4e16f82296c2a15daed
+  )
+endif()
+
+set(WITH_CUDA OFF)
+if("cuda" IN_LIST FEATURES)
+  set(WITH_CUDA ON)
+endif()
+
+set(WITH_FFMPEG OFF)
+if("ffmpeg" IN_LIST FEATURES)
+  set(WITH_FFMPEG ON)
+  vcpkg_download_distfile(OCV_DOWNLOAD
+    URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/0a0e88972a7ea97708378d0488a65f83e7cc5e69/ffmpeg/opencv_ffmpeg.dll"
+    FILENAME "opencv-cache/ffmpeg/b8120c07962d591e2e9071a1bf566fd0-opencv_ffmpeg.dll"
+    SHA512 53325e3bb04de19273270475d7b7d9190c950b0d12e1179feef63c69ba66c9f8593d8ed9b030109dee8c104ab5babea69f18c7cae7366a57d48272d67c00d871
+  )
+  vcpkg_download_distfile(OCV_DOWNLOAD
+    URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/0a0e88972a7ea97708378d0488a65f83e7cc5e69/ffmpeg/opencv_ffmpeg_64.dll"
+    FILENAME "opencv-cache/ffmpeg/dc9c50e7b05482acc25d6ce0ac61bf1d-opencv_ffmpeg_64.dll"
+    SHA512 7d90df6f5d141f842a45e5678cf1349657612321250ece4ad5c6b5fb28a50140735d91ced0ce1a6e81962ef87236cbd1669c0b4410308f70fccee341a7a5c28b
+  )
+  vcpkg_download_distfile(OCV_DOWNLOAD
+    URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/0a0e88972a7ea97708378d0488a65f83e7cc5e69/ffmpeg/ffmpeg_version.cmake"
+    FILENAME "opencv-cache/ffmpeg/3b90f67f4b429e77d3da36698cef700c-ffmpeg_version.cmake"
+    SHA512 7d0142c30ac6f6260c1bcabc22753030fd25a708477fa28053e8df847c366967d3b93a8ac14af19a2b7b73d9f8241749a431458faf21a0c8efc7d6d99eecfdcf
+  )
+endif()
+
+set(WITH_IPP OFF)
+if("ipp" IN_LIST FEATURES)
+  set(WITH_IPP ON)
+
+  if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+    vcpkg_download_distfile(IPPICV_ARCHIVE
+        URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/dfe3162c237af211e98b8960018b564bc209261d/ippicv/ippicv_2017u3_win_intel64_general_20170822.zip"
+        FILENAME "opencv-cache/ippicv/0421e642bc7ad741a2236d3ec4190bdd-ippicv_2017u3_win_intel64_general_20170822.zip"
+        SHA512 1b2b66ac60e5b6ba2fc95a3839d09b7fcfb42628dc6e01648727ee5394f6405702f69f741371627a9e1690294147c730196f1c9872339301c92a1424f159df6c
+    )
+  else()
+    vcpkg_download_distfile(OCV_DOWNLOAD
+        URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/dfe3162c237af211e98b8960018b564bc209261d/ippicv/ippicv_2017u3_win_ia32_general_20170822.zip"
+        FILENAME "opencv-cache/ippicv/8a7680ae352c192de2e2e34936164bd0-ippicv_2017u3_win_ia32_general_20170822.zip"
+        SHA512 6bbe08264b56117d4a00118088d72274396964bb904fb0719fc48beeb458ac31bea3d4d2fa2e0449f55af42471758f2c090c82061c91985c8b7994ed3b71df81
+    )
+  endif()
+endif()
+
+set(WITH_QT OFF)
+if("qt" IN_LIST FEATURES)
+  set(WITH_QT ON)
+endif()
+
+set(WITH_VTK OFF)
+if("vtk" IN_LIST FEATURES)
+  set(WITH_VTK ON)
+endif()
+
+set(WITH_WEBP OFF)
+if("webp" IN_LIST FEATURES)
+  set(WITH_WEBP ON)
+  list(APPEND CMAKE_MODULE_PATH ${CURRENT_INSTALLED_DIR}/share/libwebp)
+endif()
+
+set(WITH_GDCM OFF)
+if("gdcm" IN_LIST FEATURES)
+  set(WITH_GDCM ON)
+endif()
+
+set(WITH_OPENGL OFF)
+if("opengl" IN_LIST FEATURES)
+  set(WITH_OPENGL ON)
+endif()
+
+set(WITH_OPENEXR OFF)
+if("openexr" IN_LIST FEATURES)
+  set(WITH_OPENEXR ON)
+  list(APPEND CMAKE_MODULE_PATH ${CURRENT_INSTALLED_DIR}/share/openexr)
+endif()
+
+set(WITH_MSMF ON)
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+  set(WITH_MSMF OFF)
+endif()
+
+set(WITH_TIFF OFF)
+if("tiff" IN_LIST FEATURES)
+  set(WITH_TIFF ON)
+endif()
+
+set(WITH_JPEG OFF)
+if("jpeg" IN_LIST FEATURES)
+  set(WITH_JPEG ON)
+endif()
+
+set(WITH_JASPER OFF)
+if("jasper" IN_LIST FEATURES)
+  set(WITH_JASPER ON)
+endif()
+
+set(WITH_PNG OFF)
+if("png" IN_LIST FEATURES)
+  set(WITH_PNG ON)
+endif()
+
+set(WITH_EIGEN OFF)
+if("eigen" IN_LIST FEATURES)
+  set(WITH_EIGEN ON)
+endif()
+
+if(BUILD_opencv_contrib)
+  vcpkg_from_github(
+      OUT_SOURCE_PATH CONTRIB_SOURCE_PATH
+      REPO opencv/opencv_contrib
+      REF ${OPENCV_PORT_VERSION}
+      SHA512 431dfba0f413071d7faa18bc6e6f5e4f015285e2cc730c5dd69b2a4d6aa4250b7e0bcb1814ac6f06f5c76f103aea1f93f72f32aee6bc0cd7ddacdaf1f40075c1
+      HEAD_REF master
+  )
+  set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules")
+endif()
+
+set(WITH_ZLIB ON)
+set(BUILD_opencv_line_descriptor ON)
+set(BUILD_opencv_saliency ON)
+set(BUILD_opencv_bgsegm ON)
+if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
+  set(BUILD_opencv_line_descriptor OFF)
+  set(BUILD_opencv_saliency OFF)
+  set(BUILD_opencv_bgsegm OFF)
+endif()
+
+string(REPLACE ";" "\\\\\;" CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}")
 
 vcpkg_configure_cmake(
+    PREFER_NINJA
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
-        -DBUILD_ZLIB=OFF
-        -DBUILD_TIFF=OFF
-        -DBUILD_JPEG=OFF
-        -DBUILD_PNG=OFF
-        -DBUILD_opencv_python2=OFF
-        -DBUILD_opencv_python3=OFF
-        -DBUILD_opencv_apps=OFF
+        # Ungrouped Entries
+        -DOpenCV_DISABLE_ARCH_PATH=ON
+        # Do not build docs/examples
         -DBUILD_DOCS=OFF
         -DBUILD_EXAMPLES=OFF
+        # Do not build integrated libraries, use external ones whenever possible
+        -DBUILD_JASPER=OFF
+        -DBUILD_JPEG=OFF
+        -DBUILD_OPENEXR=OFF
         -DBUILD_PACKAGE=OFF
         -DBUILD_PERF_TESTS=OFF
+        -DBUILD_PNG=OFF
+        -DBUILD_PROTOBUF=OFF
         -DBUILD_TESTS=OFF
+        -DBUILD_TIFF=OFF
+        -DBUILD_WEBP=OFF
         -DBUILD_WITH_DEBUG_INFO=ON
-        -DOpenCV_DISABLE_ARCH_PATH=ON
-        -DWITH_FFMPEG=OFF
+        -DBUILD_WITH_STATIC_CRT=${BUILD_WITH_STATIC_CRT}
+        -DBUILD_ZLIB=OFF
+        # Select which OpenCV modules should be built
+        -DBUILD_opencv_apps=OFF
+        -DBUILD_opencv_bgsegm=${BUILD_opencv_bgsegm}
+        -DBUILD_opencv_dnn=${BUILD_opencv_dnn}
+        -DBUILD_opencv_flann=${BUILD_opencv_flann}
+        -DBUILD_opencv_line_descriptor=${BUILD_opencv_line_descriptor}
+        -DBUILD_opencv_ovis=${BUILD_opencv_ovis}
+        -DBUILD_opencv_python2=OFF
+        -DBUILD_opencv_python3=OFF
+        -DBUILD_opencv_saliency=${BUILD_opencv_saliency}
+        -DBUILD_opencv_sfm=${BUILD_opencv_sfm}
+        # PROTOBUF
+        -DPROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES}
+        -DUPDATE_PROTO_FILES=${UPDATE_PROTO_FILES}
+        # CMAKE
+        -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON
+        "-DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}"
+        # ENABLE
+        -DENABLE_CXX11=ON
+        -DENABLE_PYLINT=OFF
+        # INSTALL
         -DINSTALL_FORCE_UNIX_PATHS=ON
+        -DINSTALL_LICENSE=OFF
+        # OPENCV
         -DOPENCV_CONFIG_INSTALL_PATH=share/opencv
+        "-DOPENCV_DOWNLOAD_PATH=${DOWNLOADS}/opencv-cache"
+        ${BUILD_WITH_CONTRIB_FLAG}
         -DOPENCV_OTHER_INSTALL_PATH=share/opencv
-        -DINSTALL_LICENSE=OFF
-        -DWITH_CUDA=OFF
+        # WITH
         -DWITH_CUBLAS=OFF
-        -DWITH_OPENCLAMDBLAS=OFF
+        -DWITH_CUDA=${WITH_CUDA}
+        -DWITH_EIGEN=${WITH_EIGEN}
+        -DWITH_FFMPEG=${WITH_FFMPEG}
+        -DWITH_GDCM=${WITH_GDCM}
+        -DWITH_IPP=${WITH_IPP}
+        -DWITH_JASPER=${WITH_JASPER}
+        -DWITH_JPEG=${WITH_JPEG}
         -DWITH_LAPACK=OFF
-        #-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules # uncomment the following 3 lines to build opencv_contrib modules
-        #-DBUILD_PROTOBUF=OFF
-        #-DUPDATE_PROTO_FILES=ON
+        -DWITH_MSMF=${WITH_MSMF}
+        -DWITH_OPENCLAMDBLAS=OFF
+        -DWITH_OPENEXR=${WITH_OPENEXR}
+        -DWITH_OPENGL=${WITH_OPENGL}
+        -DWITH_PNG=${WITH_PNG}
+        -DWITH_PROTOBUF=${WITH_PROTOBUF}
+        -DWITH_QT=${WITH_QT}
+        -DWITH_TIFF=${WITH_TIFF}
+        -DWITH_VTK=${WITH_VTK}
+        -DWITH_WEBP=${WITH_WEBP}
+        -DWITH_ZLIB=${WITH_ZLIB}
     OPTIONS_DEBUG
         -DINSTALL_HEADERS=OFF
         -DINSTALL_OTHER=OFF
@@ -69,13 +315,74 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-file(READ ${CURRENT_PACKAGES_DIR}/debug/share/opencv/OpenCVModules-debug.cmake OPENCV_DEBUG_MODULE)
-string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" OPENCV_DEBUG_MODULE "${OPENCV_DEBUG_MODULE}")
-file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules-debug.cmake "${OPENCV_DEBUG_MODULE}")
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/opencv)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/opencv/LICENSE ${CURRENT_PACKAGES_DIR}/share/opencv/copyright)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE)
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE)
+
+if(VCPKG_PLATFORM_TOOLSET STREQUAL "v141")
+  set(OpenCV_RUNTIME vc15)
+else()
+  set(OpenCV_RUNTIME vc14)
+endif()
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
+  set(OpenCV_ARCH x64)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+  set(OpenCV_ARCH ARM)
+elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
+  set(OpenCV_ARCH ARM64)
+else()
+  set(OpenCV_ARCH x86)
+endif()
+
+file(GLOB BIN_AND_LIB ${CURRENT_PACKAGES_DIR}/${OpenCV_ARCH}/${OpenCV_RUNTIME}/*)
+file(COPY ${BIN_AND_LIB} DESTINATION ${CURRENT_PACKAGES_DIR})
+file(GLOB DEBUG_BIN_AND_LIB ${CURRENT_PACKAGES_DIR}/debug/${OpenCV_ARCH}/${OpenCV_RUNTIME}/*)
+file(COPY ${DEBUG_BIN_AND_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/${OpenCV_ARCH})
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/${OpenCV_ARCH})
+
+file(GLOB STATICLIB ${CURRENT_PACKAGES_DIR}/staticlib/*)
+if(STATICLIB)
+  file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib)
+  file(COPY ${STATICLIB} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/staticlib)
+endif()
+file(GLOB STATICLIB ${CURRENT_PACKAGES_DIR}/debug/staticlib/*)
+if(STATICLIB)
+  file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib)
+  file(COPY ${STATICLIB} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/staticlib)
+endif()
+
+file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVConfig.cmake OPENCV_CONFIG)
+string(REPLACE "/staticlib/"
+               "/lib/" OPENCV_CONFIG "${OPENCV_CONFIG}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVConfig.cmake "${OPENCV_CONFIG}")
+
+file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules-release.cmake OPENCV_CONFIG_LIB)
+string(REPLACE "/staticlib/"
+               "/lib/" OPENCV_CONFIG_LIB "${OPENCV_CONFIG_LIB}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules-release.cmake "${OPENCV_CONFIG_LIB}")
+
+file(READ ${CURRENT_PACKAGES_DIR}/debug/share/opencv/OpenCVModules-debug.cmake OPENCV_CONFIG_LIB)
+string(REPLACE "/staticlib/"
+               "/lib/" OPENCV_CONFIG_LIB "${OPENCV_CONFIG_LIB}")
+string(REPLACE "PREFIX}/lib"
+               "PREFIX}/debug/lib" OPENCV_CONFIG_LIB "${OPENCV_CONFIG_LIB}")
+string(REPLACE "PREFIX}/bin"
+               "PREFIX}/debug/bin" OPENCV_CONFIG_LIB "${OPENCV_CONFIG_LIB}")
+file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules-debug.cmake "${OPENCV_CONFIG_LIB}")
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share/opencv/OpenCVModules.cmake ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/opencv)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/opencv/LICENSE ${CURRENT_PACKAGES_DIR}/share/opencv/copyright)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/opencv)
 
 vcpkg_copy_pdbs()
+
+set(VCPKG_LIBRARY_LINKAGE "dynamic")
+
+set(VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT enabled)
diff --git a/ports/opencv/usage b/ports/opencv/usage
new file mode 100644
index 000000000..1c30e5fea
--- /dev/null
+++ b/ports/opencv/usage
@@ -0,0 +1,5 @@
+The package opencv provides CMake integration:

+

+    find_package(OpenCV REQUIRED)

+    target_include_directories(main PRIVATE ${OpenCV_INCLUDE_DIRS})

+    target_link_libraries(main PRIVATE ${OpenCV_LIBS})