[opencv3] Upgrade to version 3.4.8 (#8623)

5 files changed, 32 insertions, 77 deletions

diff --git a/ports/opencv3/0001-disable-downloading.patch b/ports/opencv3/0001-disable-downloading.patch
deleted file mode 100644
index 7e49fae2a..000000000
--- a/ports/opencv3/0001-disable-downloading.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake
-index cdc47ad..175aaf3 100644
---- a/cmake/OpenCVDownload.cmake
-+++ b/cmake/OpenCVDownload.cmake
-@@ -154,6 +154,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/opencv3/0002-install-options.patch b/ports/opencv3/0002-install-options.patch
index 3d334a0a1..b55d484a7 100644
--- a/ports/opencv3/0002-install-options.patch
+++ b/ports/opencv3/0002-install-options.patch
@@ -1,17 +1,17 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6ce583b..e9ea757 100644
+index 6e69e3a..65c9c03 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -665,7 +665,7 @@ endif()
+@@ -535,7 +535,7 @@ endif()
  
  if(WIN32)
    # Postfix of DLLs:
--  set(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}")
-+  set(OPENCV_DLLVERSION "")
-   set(OPENCV_DEBUG_POSTFIX d)
+-  ocv_update(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}")
++  ocv_update(OPENCV_DLLVERSION "")
+   ocv_update(OPENCV_DEBUG_POSTFIX d)
  else()
    # Postfix of so's:
-@@ -716,7 +716,7 @@ endif()
+@@ -588,7 +588,7 @@ endif()
  ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS)
  
  # --- Python Support ---
@@ -21,10 +21,10 @@ index 6ce583b..e9ea757 100644
  endif()
  
 diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
-index 0b9d669..142b21b 100644
+index f7fd48b..5bd5c25 100644
 --- a/cmake/OpenCVCompilerOptions.cmake
 +++ b/cmake/OpenCVCompilerOptions.cmake
-@@ -254,7 +254,6 @@ if(MSVC)
+@@ -257,7 +257,6 @@ if(MSVC)
    #endif()
  
    if(BUILD_WITH_DEBUG_INFO)
@@ -33,7 +33,7 @@ index 0b9d669..142b21b 100644
      set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
    endif()
 diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
-index 2c7c42b..e7bc157 100644
+index c7f9fc2..a22f94a 100644
 --- a/cmake/OpenCVGenConfig.cmake
 +++ b/cmake/OpenCVGenConfig.cmake
 @@ -109,7 +109,7 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
@@ -45,25 +45,17 @@ index 2c7c42b..e7bc157 100644
    ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "")
  endif()
  
-@@ -121,7 +121,7 @@ endif()
- # --------------------------------------------------------------------------------------------
- #  Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake  -> For use within binary installers/packages
- # --------------------------------------------------------------------------------------------
--if(WIN32)
-+if(0)
-   if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
-     if(BUILD_SHARED_LIBS)
-       set(_lib_suffix "lib")
 diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index 1f0d720..0bb1ff7 100644
+index 1f0d720..a1fe6fa 100644
 --- a/data/CMakeLists.txt
 +++ b/data/CMakeLists.txt
-@@ -1,8 +1,6 @@
+@@ -1,9 +1,6 @@
  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_TESTS AND OPENCV_TEST_DATA_PATH)
    install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests")
+ endif()
diff --git a/ports/opencv3/0009-fix-uwp.patch b/ports/opencv3/0009-fix-uwp.patch
index cba3963dc..f28eee278 100644
--- a/ports/opencv3/0009-fix-uwp.patch
+++ b/ports/opencv3/0009-fix-uwp.patch
@@ -1,29 +1,16 @@
 diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
-index c2fda8f..3f7dfdc 100644
+index 8b1267d..f67c2c2 100644
 --- a/cmake/OpenCVModule.cmake
 +++ b/cmake/OpenCVModule.cmake
-@@ -850,7 +850,7 @@ macro(ocv_create_module)
-     set(the_module_target ${the_module})
-   endif()
+@@ -1162,7 +1162,7 @@ function(ocv_add_perf_tests)
+         set_target_properties(${the_target} PROPERTIES FOLDER "tests performance")
+       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/core/src/utils/datafile.cpp b/modules/core/src/utils/datafile.cpp
-index f1107b0..c613ca2 100644
---- a/modules/core/src/utils/datafile.cpp
-+++ b/modules/core/src/utils/datafile.cpp
-@@ -108,7 +108,7 @@ static cv::String getModuleLocation(const void* addr)
-     CV_UNUSED(addr);
- #ifdef _WIN32
-     HMODULE m = 0;
--#if _WIN32_WINNT >= 0x0501
-+#if (_WIN32_WINNT >= 0x0501) && (!WINRT_STORE)
-     ::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
-         reinterpret_cast<LPCTSTR>(addr),
-         &m);
+-      if(WINRT)
++      if(WINRT AND BUILD_TESTS)
+         # removing APPCONTAINER from tests to run from console
+         # look for detailed description inside of ocv_create_module macro above
+         add_custom_command(TARGET "opencv_perf_${name}"
 diff --git a/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp b/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp
 index f4147f3..b92efdd 100644
 --- a/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp
@@ -48,20 +35,10 @@ index 25f4aef..5429f0b 100644
  
  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/cmake/platforms/OpenCV-WindowsStore.cmake b/cmake/platforms/OpenCV-WindowsStore.cmake
+index 8b5dfa5..efc8b4f 100644
+--- a/cmake/platforms/OpenCV-WindowsStore.cmake
++++ b/cmake/platforms/OpenCV-WindowsStore.cmake
+@@ -1 +1 @@
+-include("${CMAKE_CURRENT_LIST_DIR}/OpenCV_WinRT.cmake")
++include("${CMAKE_CURRENT_LIST_DIR}/OpenCV-WinRT.cmake")
diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL
index a59ea896b..88dfe08f4 100644
--- a/ports/opencv3/CONTROL
+++ b/ports/opencv3/CONTROL
@@ -1,5 +1,5 @@
 Source: opencv3
-Version: 3.4.7-2
+Version: 3.4.8
 Build-Depends: protobuf, zlib
 Homepage: https://github.com/opencv/opencv
 Description: computer vision library
diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake
index 8f2f633d3..03e6f0e6f 100644
--- a/ports/opencv3/portfile.cmake
+++ b/ports/opencv3/portfile.cmake
@@ -4,16 +4,15 @@ endif()
 
 include(vcpkg_common_functions)
 
-set(OPENCV_VERSION "3.4.7")
+set(OPENCV_VERSION "3.4.8")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO opencv/opencv
     REF ${OPENCV_VERSION}
-    SHA512 ba1336ad4e5208748aa09c99770392cc71ef72688560d0b03287ddafd36093ef30cbdf6422f87f8f878663ab8085cc0ff8a8c65fd1ff0ec6800855ea01309beb
+    SHA512 6c2dfa88e9a93747397f80e6a3dd7eed126bc14efe6c0ec5b064d10bc49f24fc6fb187029f3ac6f5d9f5c16465b96ba55e5d5cacc3584dce69e10567df423ccb
     HEAD_REF master
     PATCHES
-      0001-disable-downloading.patch
       0002-install-options.patch
       0003-force-package-requirements.patch
       0009-fix-uwp.patch