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/tesseract | |
| 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/tesseract')
| -rw-r--r-- | ports/tesseract/CONTROL | 3 | ||||
| -rw-r--r-- | ports/tesseract/portfile.cmake | 7 |
2 files changed, 3 insertions, 7 deletions
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) |