[OpenCV] Update to v4.1.1

ports/ffmpeg/CONTROL

@@ -1,5 +1,5 @@
 Source: ffmpeg
-Version: 4.1-8
+Version: 4.1-9
 Homepage: https://ffmpeg.org
 Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.
  FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations.

ports/ffmpeg/FindFFMPEG.cmake

@@ -35,6 +35,8 @@ include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
 include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
 include(${CMAKE_ROOT}/Modules/CMakeFindDependencyMacro.cmake)
 
+set(FFMPEG_VERSION "4.1")
+
 find_dependency(Threads)
 #list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS Threads::Threads)
 if(UNIX)
@@ -92,8 +94,10 @@ if(WIN32)
  if (FFMPEG_stdint_INCLUDE_DIRS)
  set(STDINT_OK TRUE)
  endif()
+ FFMPEG_FIND_GENEX(libzlib zlib zlib.h)
 else()
  set(STDINT_OK TRUE)
+ FFMPEG_FIND_GENEX(libzlib z zlib.h)
 endif()
 
 FFMPEG_FIND(libavcodec avcodec avcodec.h)
@@ -103,13 +107,20 @@ FFMPEG_FIND(libavformat avformat avformat.h)
 FFMPEG_FIND(libavutil avutil avutil.h)
 FFMPEG_FIND(libswresample swresample swresample.h)
 FFMPEG_FIND(libswscale swscale swscale.h)
-FFMPEG_FIND_GENEX(libzlib zlib zlib.h)
 
 if (FFMPEG_libavcodec_FOUND AND FFMPEG_libavdevice_FOUND AND FFMPEG_libavfilter_FOUND AND FFMPEG_libavformat_FOUND AND FFMPEG_libavutil_FOUND AND FFMPEG_libswresample_FOUND AND FFMPEG_libswscale_FOUND AND FFMPEG_libzlib_FOUND AND STDINT_OK)
  list(APPEND FFMPEG_INCLUDE_DIRS ${FFMPEG_libavformat_INCLUDE_DIRS} ${FFMPEG_libavdevice_INCLUDE_DIRS} ${FFMPEG_libavcodec_INCLUDE_DIRS} ${FFMPEG_libavutil_INCLUDE_DIRS} ${FFMPEG_libswscale_INCLUDE_DIRS} ${FFMPEG_stdint_INCLUDE_DIRS})
  list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
  list(REMOVE_DUPLICATES FFMPEG_LIBRARY_DIRS)
 
+ set(FFMPEG_libavformat_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+ set(FFMPEG_libavdevice_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+ set(FFMPEG_libavcodec_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+ set(FFMPEG_libavutil_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+ set(FFMPEG_libswscale_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+ set(FFMPEG_libavfilter_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+ set(FFMPEG_libswresample_VERSION "${FFMPEG_VERSION}" CACHE STRING "")
+
  list(APPEND FFMPEG_LIBRARIES
  ${FFMPEG_libavformat_LIBRARY}
  ${FFMPEG_libavdevice_LIBRARY}

ports/opencv/0002-install-options.patch

@@ -1,59 +1,60 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -312,6 +312,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)
-+OCV_OPTION(INSTALL_HEADERS "Install header files" ON)
-+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
- # ===================================================
-@@ -378,7 +382,9 @@ else()
- endif()
+@@ -514,7 +514,7 @@ endif()
 
  if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
-- if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
-+ if(DEFINED OpenCV_DISABLE_ARCH_PATH)
+  if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
+- ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
 + ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "")
-+ elseif(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
- ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
  else()
  message(STATUS "Can't detect runtime and/or arch")
-@@ -433,12 +439,8 @@ else()
- ocv_update(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}")
+ ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "")
+@@ -568,15 +568,15 @@ else()
 
  if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
-- if(OpenCV_STATIC)
+  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_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib${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)
-@@ -901,7 +903,7 @@ if(NOT OPENCV_LICENSE_FILE)
+- ocv_update(OPENCV_CONFIG_INSTALL_PATH ".")
++ ocv_update(OPENCV_CONFIG_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}share/opencv/")
+ ocv_update(OPENCV_INCLUDE_INSTALL_PATH "include")
+ ocv_update(OPENCV_LICENSES_INSTALL_PATH "${OPENCV_OTHER_INSTALL_PATH}/licenses")
+ else()
+@@ -681,7 +681,7 @@ endif()
+ ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS)
+
+ # --- Python Support ---
+-if(NOT IOS)
++if(0)
+ include(cmake/OpenCVDetectPython.cmake)
  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)
+--- a/cmake/OpenCVCompilerOptions.cmake
++++ b/cmake/OpenCVCompilerOptions.cmake
+@@ -234,7 +234,6 @@ if(MSVC)
+ #endif()
+
+ if(BUILD_WITH_DEBUG_INFO)
+- set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi")
+ set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
+ set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
+ endif()
 --- a/cmake/OpenCVGenConfig.cmake
 +++ b/cmake/OpenCVGenConfig.cmake
 @@ -105,7 +105,7 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
  endif()
  endfunction()
 
 -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)
++if(NOT ANDROID)
  ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "")
  endif()
 
@@ -62,76 +63,18 @@
  # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages
  # --------------------------------------------------------------------------------------------
 -if(WIN32)
-+if(WIN32 AND NOT INSTALL_FORCE_UNIX_PATHS)
++if(0)
  if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
  if(BUILD_SHARED_LIBS)
  set(_lib_suffix "lib")
---- a/cmake/OpenCVGenHeaders.cmake
-+++ b/cmake/OpenCVGenHeaders.cmake
-@@ -1,7 +1,9 @@
- # platform-specific config file
- configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/cvconfig.h.in" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/cvconfig.h")
- configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/cvconfig.h.in" "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/opencv2/cvconfig.h")
--install(FILES "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/cvconfig.h" DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2 COMPONENT dev)
-+if(INSTALL_HEADERS)
-+ install(FILES "${OPENCV_CONFIG_FILE_INCLUDE_DIR}/cvconfig.h" DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2 COMPONENT dev)
-+endif()
-
- # 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()
-\ No newline at end of file
---- a/cmake/OpenCVModule.cmake
-+++ b/cmake/OpenCVModule.cmake
-@@ -1000,7 +1000,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 @@
+@@ -1,8 +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_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")
---- a/include/CMakeLists.txt
-+++ b/include/CMakeLists.txt
-@@ -1,7 +1,9 @@
--file(GLOB old_hdrs "opencv/*.h*")
--install(FILES ${old_hdrs}
-- DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv
-- COMPONENT dev)
--install(FILES "opencv2/opencv.hpp"
-- DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2
-- COMPONENT dev)
-+if(INSTALL_HEADERS)
-+ file(GLOB old_hdrs "opencv/*.h*")
-+ install(FILES ${old_hdrs}
-+ DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv
-+ COMPONENT dev)
-+ install(FILES "opencv2/opencv.hpp"
-+ DESTINATION ${OPENCV_INCLUDE_INSTALL_PATH}/opencv2
-+ COMPONENT dev)
-+endif()

ports/opencv/0004-use-find-package-required.patch → ports/opencv/0003-force-package-requirements.patch

@@ -1,3 +1,5 @@
+diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
+index 91afcc4..76e596f 100644
 --- a/cmake/OpenCVFindLibsGrfmt.cmake
 +++ b/cmake/OpenCVFindLibsGrfmt.cmake
 @@ -6,7 +6,7 @@
@@ -16,9 +18,9 @@
 - include(FindJPEG)
 + find_package(JPEG REQUIRED)
  endif()
-
+ 
  if(NOT JPEG_FOUND)
-@@ -51,7 +51,7 @@ if(WITH_TIFF)
+@@ -74,7 +74,7 @@ if(WITH_TIFF)
  if(BUILD_TIFF)
  ocv_clear_vars(TIFF_FOUND)
  else()
@@ -27,7 +29,7 @@
  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)
+@@ -117,7 +117,7 @@ if(WITH_WEBP)
  if(BUILD_WEBP)
  ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR)
  else()
@@ -36,16 +38,16 @@
  if(WEBP_FOUND)
  set(HAVE_WEBP 1)
  endif()
-@@ -135,7 +135,7 @@ if(WITH_JASPER)
+@@ -158,7 +158,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)
+@@ -182,7 +182,7 @@ if(WITH_PNG)
  if(BUILD_PNG)
  ocv_clear_vars(PNG_FOUND)
  else()
@@ -54,30 +56,37 @@
  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)
+@@ -214,7 +214,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()
-
+@@ -230,7 +230,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)
+@@ -242,7 +242,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)
+@@ -272,4 +272,4 @@ if(WITH_IMGCODEC_PFM)
+ set(HAVE_IMGCODEC_PFM ON)
+ elseif(DEFINED WITH_IMGCODEC_PFM)
+ set(HAVE_IMGCODEC_PFM OFF)
+-endif()
+\ No newline at end of file
++endif()