diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-01-17 04:26:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-16 19:26:38 -0800 |
| commit | f89336d703bf3ffd2aa4f832f214b42a11c7d044 (patch) | |
| tree | 891f90e6a3e714c4af552984425a2987cfe0d352 /ports/opencv3 | |
| parent | 31eda3e931f30a480d90eac5f5ffa9fa9944121d (diff) | |
| download | vcpkg-f89336d703bf3ffd2aa4f832f214b42a11c7d044.tar.gz vcpkg-f89336d703bf3ffd2aa4f832f214b42a11c7d044.zip | |
[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>
Diffstat (limited to 'ports/opencv3')
| -rw-r--r-- | ports/opencv3/CONTROL | 10 | ||||
| -rw-r--r-- | ports/opencv3/portfile.cmake | 8 |
2 files changed, 12 insertions, 6 deletions
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)") |