[libarchive+tesseract+opencv] add missing libarchiveConfig.cmake, fix tesseract downstream and unblock opencv CI (#15089)

* [tesseract] add missing reference for downstream projects

* [tesseract] restore ci, fix many regressions that are uncovered by that

* Update ports/opencv2/CONTROL

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* [opencv] fix regressions on uwp, accept failure on arm64 for now

* Apply suggestions from code review

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* [opencv4] allow failures on all arm windows targets, both win32 and uwp

* adopts hints from #15180

* [libarchive] bump control version

* [libarchive] use vcpkg-cmake-wrapper instead of a custom libarchiveConfig, since it is vcpkg-provided and not port-provided

* enable features to be visible in parent scope

* apply documentation fix from CI

* [libarchive] remove unnecessary lines in portfile

* fix regressions

* Update ports/gdcm/CONTROL

* use more compact logic syntax

* add new versions to baseline

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

14 files changed, 88 insertions, 47 deletions

diff --git a/ports/dmlc/CONTROL b/ports/dmlc/CONTROL
index 8bf079c7f..7021ffdcd 100644
--- a/ports/dmlc/CONTROL
+++ b/ports/dmlc/CONTROL
@@ -1,9 +1,9 @@
 Source: dmlc
-Version: 2019-08-12-4
+Version: 2019-08-12
+Port-Version: 5
 Homepage: https://github.com/dmlc/dmlc-core
 Description: DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.
-Default-Features: openmp
 Supports: !uwp
 
 Feature: openmp
-Description: Build with openmp
\ No newline at end of file
+Description: Build with openmp
diff --git a/ports/gdcm/CONTROL b/ports/gdcm/CONTROL
index 67d3a0050..a08a2a5cf 100644
--- a/ports/gdcm/CONTROL
+++ b/ports/gdcm/CONTROL
@@ -1,6 +1,7 @@
 Source: gdcm
 Version: 3.0.7
+Port-Version: 1
 Homepage: https://github.com/malaterre/GDCM
 Description: Grassroots DICOM library
 Build-Depends: zlib, expat, openjpeg
-Supports: !uwp
\ No newline at end of file
+Supports: !uwp&!(windows&(arm|arm64))
diff --git a/ports/libarchive/CONTROL b/ports/libarchive/CONTROL
index e15f1da44..a16b6179e 100644
--- a/ports/libarchive/CONTROL
+++ b/ports/libarchive/CONTROL
@@ -1,6 +1,6 @@
 Source: libarchive

 Version: 3.4.3

-Port-Version: 2

+Port-Version: 3

 Homepage: https://github.com/libarchive/libarchive

 Description: Library for reading and writing streaming archives

 Build-Depends: zlib

diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake
index df7b6ce77..4e6a5fd85 100644
--- a/ports/libarchive/portfile.cmake
+++ b/ports/libarchive/portfile.cmake
@@ -64,19 +64,13 @@ vcpkg_configure_cmake(
 )

 

 vcpkg_install_cmake()

+

 vcpkg_copy_pdbs()

 

-foreach(_feature IN LISTS FEATURE_OPTIONS)

-    string(REPLACE "-D" "" _feature "${_feature}")

-    string(REPLACE "=" ";" _feature "${_feature}")

-    string(REPLACE "ON" "1" _feature "${_feature}")

-    string(REPLACE "OFF" "0" _feature "${_feature}")

-    list(GET _feature 0 _feature_name)

-    list(GET _feature 1 _feature_status)

-    set(${_feature_name} ${_feature_status})

-endforeach()

-configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)

+configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)

+

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

+

 foreach(HEADER ${CURRENT_PACKAGES_DIR}/include/archive.h ${CURRENT_PACKAGES_DIR}/include/archive_entry.h)

     file(READ ${HEADER} CONTENTS)

     string(REPLACE "(!defined LIBARCHIVE_STATIC)" "0" CONTENTS "${CONTENTS}")

diff --git a/ports/libarchive/vcpkg-cmake-wrapper.cmake b/ports/libarchive/vcpkg-cmake-wrapper.cmake.in
index 006dde98d..2e0ef0f9c 100644
--- a/ports/libarchive/vcpkg-cmake-wrapper.cmake
+++ b/ports/libarchive/vcpkg-cmake-wrapper.cmake.in
@@ -1,29 +1,50 @@
 _find_package(${ARGS})

 

+include(CMakeFindDependencyMacro)

+

+if(@ENABLE_ZLIB@)

+    find_dependency(ZLIB)

+endif()

+if(@ENABLE_BZip2@)

+    find_dependency(BZip2)

+endif()

+if(@ENABLE_LIBXML2@)

+    find_dependency(LibXml2)

+endif()

+if(@ENABLE_LZ4@)

+    find_dependency(lz4)

+endif()

+if(@ENABLE_LZMA@)

+    find_dependency(LibLZMA)

+endif()

+if(@ENABLE_ZSTD@)

+    find_dependency(zstd)

+endif()

+if(@ENABLE_OPENSSL@)

+    find_dependency(OpenSSL)

+endif()

+if(@ENABLE_LZO@)

+    find_library(LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)

+    find_library(LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)

+endif()

+

 if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")

     if(@ENABLE_ZLIB@)

-        find_package(ZLIB REQUIRED)

         list(APPEND LibArchive_LIBRARIES ZLIB::ZLIB)

     endif()

     if(@ENABLE_BZip2@)

-        find_package(BZip2 REQUIRED)

         list(APPEND LibArchive_LIBRARIES BZip2::BZip2)

     endif()

     if(@ENABLE_LIBXML2@)

-        find_package(LibXml2 REQUIRED)

         list(APPEND LibArchive_LIBRARIES LibXml2::LibXml2)

     endif()

     if(@ENABLE_LZ4@)

-        find_package(lz4 REQUIRED)

         list(APPEND LibArchive_LIBRARIES lz4::lz4)

     endif()

     if(@ENABLE_LZMA@)

-        find_package(LibLZMA REQUIRED)

         list(APPEND LibArchive_LIBRARIES LibLZMA::LibLZMA)

     endif()

     if(@ENABLE_LZO@)

-        find_library(LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)

-        find_library(LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)

         if(LZO_LIBRARY_RELEASE)

             list(APPEND LibArchive_LIBRARIES optimized ${LZO_LIBRARY_RELEASE})

         endif()

@@ -32,7 +53,6 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
         endif()

     endif()

     if(@ENABLE_ZSTD@)

-        find_package(zstd CONFIG REQUIRED)

         if(TARGET zstd::libzstd_shared)

             list(APPEND LibArchive_LIBRARIES zstd::libzstd_shared)

         else(TARGET zstd::libzstd_shared)

@@ -40,7 +60,6 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
         endif(TARGET zstd::libzstd_shared)

     endif()

     if(@ENABLE_OPENSSL@)

-        find_package(OpenSSL REQUIRED)

         list(APPEND LibArchive_LIBRARIES OpenSSL::Crypto)

     endif()

 

diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index 768d8fda7..7b0e0cfe9 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -1,9 +1,10 @@
 Source: opencv
 Version: 4.3.0
+Port-Version: 1
 Homepage: https://github.com/opencv/opencv
 Description: Computer vision library
 Build-Depends: opencv4[core]
-Default-Features: dnn, jpeg, opengl, png, tiff, webp
+Default-Features: dnn, jpeg, png, tiff, webp
 
 Feature: nonfree
 Build-Depends: opencv4[core,nonfree]
@@ -53,6 +54,10 @@ Feature: jpeg
 Build-Depends: opencv4[core,jpeg]
 Description: JPEG support for opencv
 
+Feature: lapack
+Build-Depends: opencv4[core,lapack]
+Description: LAPACK support for opencv
+
 Feature: openexr
 Build-Depends: opencv4[core,openexr]
 Description: OpenEXR support for opencv
diff --git a/ports/opencv2/CONTROL b/ports/opencv2/CONTROL
index 1e9f57cdb..266a77f40 100644
--- a/ports/opencv2/CONTROL
+++ b/ports/opencv2/CONTROL
@@ -1,9 +1,9 @@
 Source: opencv2
 Version: 2.4.13.7
-Port-Version: 4
+Port-Version: 5
 Build-Depends: zlib
 Description: computer vision library, version 2
-Default-Features: eigen, jpeg, opengl, png, tiff
+Default-Features: eigen, jpeg, png, tiff
 
 Feature: cuda
 Build-Depends: cuda
diff --git a/ports/opencv3/CONTROL b/ports/opencv3/CONTROL
index e48c5dc1d..9067dab18 100644
--- a/ports/opencv3/CONTROL
+++ b/ports/opencv3/CONTROL
@@ -1,10 +1,10 @@
 Source: opencv3
 Version: 3.4.10
-Port-Version: 4
+Port-Version: 5
 Build-Depends: zlib
 Homepage: https://github.com/opencv/opencv
 Description: computer vision library
-Default-Features: dnn, jpeg, opengl, png, tiff, webp
+Default-Features: dnn, jpeg, png, tiff, webp
 
 Feature: nonfree
 Description: allow nonfree and unredistributable libraries
@@ -14,7 +14,7 @@ Build-Depends: protobuf
 Description: opencv_flann module
 
 Feature: contrib
-Build-Depends: opencv3[dnn], hdf5 (!uwp), tesseract (!uwp)
+Build-Depends: opencv3[dnn], hdf5 (!uwp&!(windows&(arm|arm64))), tesseract (!uwp&!(windows&(arm|arm64)))
 Description: opencv_contrib module
 
 Feature: cuda
@@ -52,6 +52,10 @@ Feature: jpeg
 Build-Depends: libjpeg-turbo
 Description: JPEG support for opencv
 
+Feature: lapack
+Build-Depends: blas, lapack
+Description: LAPACK support for opencv
+
 Feature: openexr
 Build-Depends: openexr
 Description: OpenEXR support for opencv
diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake
index e194e0e9a..eff881a24 100644
--- a/ports/opencv3/portfile.cmake
+++ b/ports/opencv3/portfile.cmake
@@ -38,6 +38,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
  "halide"   WITH_HALIDE
  "jasper"   WITH_JASPER
  "jpeg"     WITH_JPEG
+ "lapack"   WITH_LAPACK
  "nonfree"  OPENCV_ENABLE_NONFREE
  "openexr"  WITH_OPENEXR
  "opengl"   WITH_OPENGL
@@ -314,8 +315,6 @@ vcpkg_configure_cmake(
         -DWITH_OPENCLAMDBLAS=OFF
         -DWITH_TBB=${WITH_TBB}
         -DWITH_OPENJPEG=OFF
-        ###### WITH PROPERTIES explicitly disabled, they have problems with libraries if already installed by user and that are "involuntarily" found during install
-        -DWITH_LAPACK=OFF
         ###### BUILD_options (mainly modules which require additional libraries)
         -DBUILD_opencv_ovis=${BUILD_opencv_ovis}
         -DBUILD_opencv_dnn=${BUILD_opencv_dnn}
@@ -374,11 +373,14 @@ find_dependency(Tesseract)")
   if("eigen" IN_LIST FEATURES)
     string(APPEND DEPS_STRING "\nfind_dependency(Eigen3 CONFIG)")
   endif()
+  if("lapack" IN_LIST FEATURES)
+    string(APPEND DEPS_STRING "\nfind_dependency(LAPACK)")
+  endif()
   if("openexr" IN_LIST FEATURES)
     string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)")
   endif()
   if(WITH_OPENMP)
-    string(APPEND DEPS_STRING "\nfind_dependency(OpenMP CONFIG)")
+    string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)")
   endif()
   if(BUILD_opencv_ovis)
     string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)")
diff --git a/ports/opencv4/0006-fix-vtk9.patch b/ports/opencv4/0008-fix-vtk9.patch
index 7942b0aa4..7942b0aa4 100644
--- a/ports/opencv4/0006-fix-vtk9.patch
+++ b/ports/opencv4/0008-fix-vtk9.patch
diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL
index 1a6882900..baebc1c59 100644
--- a/ports/opencv4/CONTROL
+++ b/ports/opencv4/CONTROL
@@ -1,10 +1,10 @@
 Source: opencv4
 Version: 4.3.0
-Port-Version: 4
+Port-Version: 5
 Build-Depends: zlib
 Homepage: https://github.com/opencv/opencv
 Description: computer vision library
-Default-Features: dnn, jpeg, opengl, png, tiff, webp
+Default-Features: dnn, jpeg, png, tiff, webp
 
 Feature: nonfree
 Description: allow nonfree and unredistributable libraries
@@ -14,7 +14,7 @@ Build-Depends: ade
 Description: graph api
 
 Feature: contrib
-Build-Depends: hdf5 (!uwp), tesseract (!uwp)
+Build-Depends: hdf5 (!uwp&!(windows&(arm|arm64))), tesseract (!uwp&!(windows&(arm|arm64)))
 Description: opencv_contrib module
 
 Feature: cuda
@@ -52,6 +52,10 @@ Feature: jpeg
 Build-Depends: libjpeg-turbo
 Description: JPEG support for opencv
 
+Feature: lapack
+Build-Depends: blas, lapack
+Description: LAPACK support for opencv
+
 Feature: openexr
 Build-Depends: openexr
 Description: OpenEXR support for opencv
diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
index 23c9184e7..007ce8a26 100644
--- a/ports/opencv4/portfile.cmake
+++ b/ports/opencv4/portfile.cmake
@@ -19,8 +19,8 @@ vcpkg_from_github(
       0002-install-options.patch
       0003-force-package-requirements.patch
       0004-fix-policy-CMP0057.patch
-      0006-fix-vtk9.patch
       0006-jpeg2000_getref.patch
+      0008-fix-vtk9.patch
       0009-fix-uwp.patch
       0010-fix-interface_link_libraries.patch # Remove this patch when the next update
 )
@@ -42,6 +42,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
  "halide"   WITH_HALIDE
  "jasper"   WITH_JASPER
  "jpeg"     WITH_JPEG
+ "lapack"   WITH_LAPACK
  "nonfree"  OPENCV_ENABLE_NONFREE
  "openexr"  WITH_OPENEXR
  "opengl"   WITH_OPENGL
@@ -65,6 +66,19 @@ if("dnn" IN_LIST FEATURES)
   endif()
 endif()
 
+#OpenCV on arm on windows platform (non UWP) has serious problems right now. Disabling this module is not enough (remember to put the definition in vcpkg_configure_cmake)
+#set(BUILD_opencv_surface_matching ON)
+#if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm")
+#  set(BUILD_opencv_surface_matching OFF)
+#  message(WARNING "The surface_matching module cannot be enabled on ARM architectures")
+#endif()
+
+set(BUILD_opencv_gapi ON)
+if(VCPKG_TARGET_IS_UWP)
+  set(BUILD_opencv_gapi OFF)
+  message(WARNING "The gapi module cannot be enabled on UWP platform")
+endif()
+
 set(WITH_IPP OFF)
 if("ipp" IN_LIST FEATURES)
   set(WITH_IPP ON)
@@ -346,13 +360,12 @@ vcpkg_configure_cmake(
         -DWITH_PROTOBUF=${BUILD_opencv_dnn}
         -DWITH_TBB=${WITH_TBB}
         -DWITH_OPENJPEG=OFF
-        ###### WITH PROPERTIES explicitly disabled, they have problems with libraries if already installed by user and that are "involuntarily" found during install
-        -DWITH_LAPACK=OFF
         ###### BUILD_options (mainly modules which require additional libraries)
         -DBUILD_opencv_ovis=${BUILD_opencv_ovis}
         -DBUILD_opencv_dnn=${BUILD_opencv_dnn}
         ###### The following modules are disabled for UWP
         -DBUILD_opencv_quality=${BUILD_opencv_quality}
+        -DBUILD_opencv_gapi=${DBUILD_opencv_gapi}
         ###### The following module is disabled because it's broken #https://github.com/opencv/opencv_contrib/issues/2307
         -DBUILD_opencv_rgbd=OFF
         ###### Additional build flags
@@ -411,8 +424,11 @@ find_dependency(Tesseract)")
   if("openexr" IN_LIST FEATURES)
     string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)")
   endif()
+  if("lapack" IN_LIST FEATURES)
+    string(APPEND DEPS_STRING "\nfind_dependency(LAPACK)")
+  endif()
   if(WITH_OPENMP)
-    string(APPEND DEPS_STRING "\nfind_dependency(OpenMP CONFIG)")
+    string(APPEND DEPS_STRING "\nfind_dependency(OpenMP)")
   endif()
   if(BUILD_opencv_ovis)
     string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)")
diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL
index 530abc04d..021496d32 100644
--- a/ports/tesseract/CONTROL
+++ b/ports/tesseract/CONTROL
@@ -1,9 +1,10 @@
 Source: tesseract
 Version: 4.1.1
-Port-Version: 5
+Port-Version: 6
 Homepage: https://github.com/tesseract-ocr/tesseract
 Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.
 Build-Depends: leptonica, libarchive
+Supports: !(windows&(arm|arm64))
 
 Feature: training-tools
 Description: build training tools
diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake
index d08e31907..e5e09e4d0 100644
--- a/ports/tesseract/portfile.cmake
+++ b/ports/tesseract/portfile.cmake
@@ -42,12 +42,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 file(READ ${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake TESSERACT_CONFIG)
 string(REPLACE "find_package(Leptonica REQUIRED)"
                "find_package(Leptonica REQUIRED)
-find_package(OpenSSL REQUIRED)
-find_package(ZLIB REQUIRED)
-find_package(BZip2 REQUIRED)
-find_package(LibXml2 REQUIRED)
-find_package(zstd REQUIRED)
-find_package(LibLZMA REQUIRED)" TESSERACT_CONFIG "${TESSERACT_CONFIG}")
+find_package(LibArchive REQUIRED)" TESSERACT_CONFIG "${TESSERACT_CONFIG}")
 file(WRITE ${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake "${TESSERACT_CONFIG}")
 
 vcpkg_copy_tools(TOOL_NAMES tesseract AUTO_CLEAN)