graphics/opencv: update to 4.5.3

Changes in the port:
- fix prefetch of third party software
        - prefetching of distfiles has been fixed
	- cmake will now throw an error in ocv_download()
	  if it is still called
- minor cleanup

- next step: readd some more options, and improve port for
  non-poudriere users

PR:		256669

8 files changed, 161 insertions, 9 deletions

diff --git a/graphics/opencv/files/patch-3rdparty_ippicv_ippicv.cmake b/graphics/opencv/files/patch-3rdparty_ippicv_ippicv.cmake
new file mode 100644
index 000000000000..d63f36d225a6
--- /dev/null
+++ b/graphics/opencv/files/patch-3rdparty_ippicv_ippicv.cmake
@@ -0,0 +1,26 @@
+--- 3rdparty/ippicv/ippicv.cmake.orig	2021-07-05 12:03:22 UTC
++++ 3rdparty/ippicv/ippicv.cmake
+@@ -34,18 +34,11 @@ function(download_ippicv root_var)
+   endif()
+ 
+   set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv")
+-  ocv_download(FILENAME ${OPENCV_ICV_NAME}
+-               HASH ${OPENCV_ICV_HASH}
+-               URL
+-                 "${OPENCV_IPPICV_URL}"
+-                 "$ENV{OPENCV_IPPICV_URL}"
+-                 "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${IPPICV_COMMIT}/ippicv/"
+-               DESTINATION_DIR "${THE_ROOT}"
+-               ID IPPICV
+-               STATUS res
+-               UNPACK RELATIVE_URL)
+-
+-  if(res)
++  set(FILENAME ${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR})
++  if(EXISTS ${FILENAME})
++    message("++ ippicv: Using prefetched ${OPENCV_ICV_PACKAGE_SUBDIR}")
+     set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE)
++  else()
++    message(WARNING "++ ippicv: Could not find ${OPENCV_ICV_PACKAGE_SUBDIR} in ${FILENAME}")
+   endif()
+ endfunction()
diff --git a/graphics/opencv/files/patch-cmake_OpenCVDownload.cmake b/graphics/opencv/files/patch-cmake_OpenCVDownload.cmake
new file mode 100644
index 000000000000..33fe16ac87fa
--- /dev/null
+++ b/graphics/opencv/files/patch-cmake_OpenCVDownload.cmake
@@ -0,0 +1,14 @@
+TODO: instead of patching the callers of ocv_download() to not use it,
+it would be nicer to just make ocv_download use the cached file from
+${FILESDIR}
+
+--- cmake/OpenCVDownload.cmake.orig	2021-07-18 09:08:36 UTC
++++ cmake/OpenCVDownload.cmake
+@@ -159,6 +159,7 @@ function(ocv_download)
+     ocv_download_log("#cmake_download \"${CACHE_CANDIDATE}\" \"${DL_URL}\"")
+     foreach(try ${OPENCV_DOWNLOAD_TRIES_LIST})
+       ocv_download_log("#try ${try}")
++      message(FATAL_ERROR "++ Trying to download file ${CACHE_CANDIDATE} via cmake from ${DL_URL}")
+       file(DOWNLOAD "${DL_URL}" "${CACHE_CANDIDATE}"
+            STATUS status
+            LOG __log
diff --git a/graphics/opencv/files/patch-contrib_modules_face_CMakeLists.txt b/graphics/opencv/files/patch-contrib_modules_face_CMakeLists.txt
new file mode 100644
index 000000000000..70a24fb1cf7d
--- /dev/null
+++ b/graphics/opencv/files/patch-contrib_modules_face_CMakeLists.txt
@@ -0,0 +1,28 @@
+--- contrib/modules/face/CMakeLists.txt.orig	2021-07-18 08:24:18 UTC
++++ contrib/modules/face/CMakeLists.txt
+@@ -10,18 +10,11 @@ ocv_define_module(face opencv_core
+ 
+ set(__commit_hash "8afa57abc8229d611c4937165d20e2a2d9fc5a12")
+ set(__file_hash "7505c44ca4eb54b4ab1e4777cb96ac05")
+-ocv_download(
+-    FILENAME face_landmark_model.dat
+-    HASH ${__file_hash}
+-    URL
+-      "${OPENCV_FACE_ALIGNMENT_URL}"
+-      "$ENV{OPENCV_FACE_ALIGNMENT_URL}"
+-      "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${__commit_hash}/"
+-    DESTINATION_DIR "${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}/cv/face/"
+-    ID "data"
+-    RELATIVE_URL
+-    STATUS res
+-)
+-if(NOT res)
+-  message(WARNING "Face: Can't get model file for face alignment.")
++set(file_id face_landmark_model.dat)
++set(FILENAME ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}/cv/face/${file_id})
++if(EXISTS ${FILENAME})
++    message("++ Face: Using prefetched ${file_id}")
++else()
++    message(WARNING "++ Face: Could not find ${file_id} in ${FILENAME}")
++    message(WARNING "Face: Can't get model file for face alignment.")
+ endif()
diff --git a/graphics/opencv/files/patch-contrib_modules_wechat__qrcode_CMakeLists.txt b/graphics/opencv/files/patch-contrib_modules_wechat__qrcode_CMakeLists.txt
new file mode 100644
index 000000000000..a30731c0c3ea
--- /dev/null
+++ b/graphics/opencv/files/patch-contrib_modules_wechat__qrcode_CMakeLists.txt
@@ -0,0 +1,26 @@
+--- contrib/modules/wechat_qrcode/CMakeLists.txt.orig	2021-07-18 07:59:28 UTC
++++ contrib/modules/wechat_qrcode/CMakeLists.txt
+@@ -23,17 +23,12 @@ set(model_names detect sr)
+ 
+ foreach(model_name ${model_names})
+     foreach(model_type ${model_types})
+-        ocv_download(FILENAME ${model_name}.${model_type}
+-                        HASH ${hash_${model_name}_${model_type}}
+-                        URL
+-                        "${OPENCV_WECHAT_QRCODE_URL}"
+-                        "$ENV{OPENCV_WECHAT_QRCODE_URL}"
+-                        "https://raw.githubusercontent.com/WeChatCV/opencv_3rdparty/${wechat_qrcode_commit_hash}/"
+-                        DESTINATION_DIR "${CMAKE_BINARY_DIR}/downloads/wechat_qrcode"
+-                        ID "wechat_qrcode"
+-                        RELATIVE_URL
+-                        STATUS res)
+-        if(NOT res)
++        set(DESTINATION_DIR "${CMAKE_BINARY_DIR}/downloads/wechat_qrcode")
++        set(FILENAME ${DESTINATION_DIR}/${model_name}.${model_type})
++        if(EXISTS ${FILENAME})
++            message("++ WeChatQRCode: Using prefetched ${model_name}.${model_type}")
++        else()
++            message(WARNING "++ WeChatQRCode: Could not find ${name_${id}} in ${FILENAME}")
+             message(WARNING "WeChatQRCode: Can't get ${model_name} ${model_type} file for wechat qrcode.")
+         endif()
+     endforeach()
diff --git a/graphics/opencv/files/patch-contrib_modules_xfeatures2d_cmake_download__boostdesc.cmake b/graphics/opencv/files/patch-contrib_modules_xfeatures2d_cmake_download__boostdesc.cmake
new file mode 100644
index 000000000000..1a1083aeba5e
--- /dev/null
+++ b/graphics/opencv/files/patch-contrib_modules_xfeatures2d_cmake_download__boostdesc.cmake
@@ -0,0 +1,25 @@
+--- contrib/modules/xfeatures2d/cmake/download_boostdesc.cmake.orig	2021-07-04 21:55:23 UTC
++++ contrib/modules/xfeatures2d/cmake/download_boostdesc.cmake
+@@ -19,17 +19,11 @@ function(download_boost_descriptors dst_dir status_var
+ 
+   set(${status_var} TRUE PARENT_SCOPE)
+   foreach(id ${ids})
+-    ocv_download(FILENAME ${name_${id}}
+-                 HASH ${hash_${id}}
+-                 URL
+-                   "${OPENCV_BOOSTDESC_URL}"
+-                   "$ENV{OPENCV_BOOSTDESC_URL}"
+-                   "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${OPENCV_3RDPARTY_COMMIT}/"
+-                 DESTINATION_DIR ${dst_dir}
+-                 ID "xfeatures2d/boostdesc"
+-                 RELATIVE_URL
+-                 STATUS res)
+-    if(NOT res)
++    set(FILENAME ${dst_dir}/${name_${id}})
++    if(EXISTS ${FILENAME})
++      message("++ xfeatures2d/boostdesc: Using prefetched ${name_${id}}")
++    else()
++      message(WARNING "++ xfeatures2d/boostdesc: Could not find ${name_${id}} in ${FILENAME}")
+       set(${status_var} FALSE PARENT_SCOPE)
+     endif()
+   endforeach()
diff --git a/graphics/opencv/files/patch-contrib_modules_xfeatures2d_cmake_download__vgg.cmake b/graphics/opencv/files/patch-contrib_modules_xfeatures2d_cmake_download__vgg.cmake
new file mode 100644
index 000000000000..cc7f249ddf81
--- /dev/null
+++ b/graphics/opencv/files/patch-contrib_modules_xfeatures2d_cmake_download__vgg.cmake
@@ -0,0 +1,27 @@
+--- contrib/modules/xfeatures2d/cmake/download_vgg.cmake.orig	2021-07-18 08:11:09 UTC
++++ contrib/modules/xfeatures2d/cmake/download_vgg.cmake
+@@ -13,18 +13,12 @@ function(download_vgg_descriptors dst_dir status_var)
+ 
+   set(${status_var} TRUE PARENT_SCOPE)
+   foreach(id ${ids})
+-    ocv_download(FILENAME ${name_${id}}
+-                 HASH ${hash_${id}}
+-                 URL
+-                   "${OPENCV_VGGDESC_URL}"
+-                   "$ENV{OPENCV_VGGDESC_URL}"
+-                   "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${OPENCV_3RDPARTY_COMMIT}/"
+-                 DESTINATION_DIR "${dst_dir}"
+-                 ID "xfeatures2d/vgg"
+-                 RELATIVE_URL
+-                 STATUS res)
+-    if(NOT res)
+-      set(${status_var} FALSE PARENT_SCOPE)
++     set(FILENAME ${dst_dir}/${name_${id}})
++     if(EXISTS ${FILENAME})
++        message("++ xfeatures2d/vgg: Using prefetched ${name_${id}}")
++     else()
++        message(WARNING "++ xfeatures2d/vgg: Could not find ${name_${id}} in ${FILENAME}")
++        set(${status_var} FALSE PARENT_SCOPE)
+     endif()
+   endforeach()
+ endfunction()
diff --git a/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake b/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake
index 3027477e2615..45fcc5ea32ec 100644
--- a/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake
+++ b/graphics/opencv/files/patch-modules_gapi_cmake_DownloadADE.cmake
@@ -1,13 +1,12 @@
 The ade distdata is downloaded and moved to the proper location by the ports 
 framework.
 
---- modules/gapi/cmake/DownloadADE.cmake.orig	2020-12-21 20:01:38 UTC
+--- modules/gapi/cmake/DownloadADE.cmake.orig	2021-07-05 12:03:22 UTC
 +++ modules/gapi/cmake/DownloadADE.cmake
-@@ -1,23 +1,9 @@
- set(ade_src_dir "${OpenCV_BINARY_DIR}/3rdparty/ade")
+@@ -2,22 +2,18 @@ set(ade_src_dir "${OpenCV_BINARY_DIR}/3rdparty/ade")
  set(ade_filename "v0.1.1f.zip")
  set(ade_subdir "ade-0.1.1f")
--set(ade_md5 "b624b995ec9c439cbc2e9e6ee940d3a2")
+ set(ade_md5 "b624b995ec9c439cbc2e9e6ee940d3a2")
 -ocv_download(FILENAME ${ade_filename}
 -             HASH ${ade_md5}
 -             URL
@@ -20,11 +19,18 @@ framework.
 -             UNPACK RELATIVE_URL)
  
 -if (NOT res)
--    return()
++set(file_id ade-0.1.1f/CMakeLists.txt)
++set(FILENAME ${ade_src_dir}/${file_id})
++if(EXISTS ${FILENAME})
++    message("++ ade: Using prefetched ${file_id}")
++else()
++    message(WARNING "++ ade: Could not find ${file_id} in ${FILENAME}")
+     return()
 -endif()
--
++ endif()
+ 
  set(ADE_root "${ade_src_dir}/${ade_subdir}/sources/ade")
 +
  file(GLOB_RECURSE ADE_sources "${ADE_root}/source/*.cpp")
  file(GLOB_RECURSE ADE_include "${ADE_root}/include/ade/*.hpp")
- add_library(ade STATIC ${ADE_include} ${ADE_sources})
+ add_library(ade STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL}
diff --git a/graphics/opencv/files/patch-modules_videoio_src_cap__v4l.cpp b/graphics/opencv/files/patch-modules_videoio_src_cap__v4l.cpp
index ff6dbd235b52..7b3e102cf34e 100644
--- a/graphics/opencv/files/patch-modules_videoio_src_cap__v4l.cpp
+++ b/graphics/opencv/files/patch-modules_videoio_src_cap__v4l.cpp
@@ -1,6 +1,6 @@
---- modules/videoio/src/cap_v4l.cpp.orig	2021-01-30 06:58:09 UTC
+--- modules/videoio/src/cap_v4l.cpp.orig	2021-04-02 11:23:54 UTC
 +++ modules/videoio/src/cap_v4l.cpp
-@@ -231,7 +231,9 @@ make & enjoy!
+@@ -228,7 +228,9 @@ make & enjoy!
  #include <poll.h>
  
  #ifdef HAVE_CAMV4L2