diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-08-12 14:42:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-12 14:42:45 -0700 |
| commit | 0e9d0cd89bf0bb13d24ef78ccf3a528215a5dc0b (patch) | |
| tree | b94c1f9b27a209f41c98bd731381dbdf2873c8c8 | |
| parent | 0f3b6fc1638c3c0bf33a560d1ab89215b7af02fd (diff) | |
| download | vcpkg-0e9d0cd89bf0bb13d24ef78ccf3a528215a5dc0b.tar.gz vcpkg-0e9d0cd89bf0bb13d24ef78ccf3a528215a5dc0b.zip | |
[tiff][tesseract][xerces-c] Disable unmanaged optional dependencies (#7622)
| -rw-r--r-- | ports/tesseract/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tesseract/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/tiff/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tiff/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/xerces-c/CONTROL | 2 | ||||
| -rw-r--r-- | ports/xerces-c/portfile.cmake | 1 |
6 files changed, 11 insertions, 7 deletions
diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL index a31493e76..a24dd9435 100644 --- a/ports/tesseract/CONTROL +++ b/ports/tesseract/CONTROL @@ -1,5 +1,5 @@ Source: tesseract
-Version: 4.1.0-1
+Version: 4.1.0-2
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
diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index e9c2ffa9f..08f581cfe 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( SHA512 d617f5c5b826640b2871dbe3d7973bcc5e66fafd837921a20e009d683806ed50f0f258aa455019d99fc54f5cb65c2fa0380e3a3c92b39ab0684b8799c730b09d PATCHES fix-tiff-linkage.patch - fix-text2image.patch + fix-text2image.patch ) # The built-in cmake FindICU is better @@ -38,9 +38,10 @@ vcpkg_configure_cmake( OPTIONS -DSTATIC=ON -DUSE_SYSTEM_ICU=True - #any value for vcpkg leptonica link cmake branch select - -DLeptonica_DIR=YES - ${OPTIONS_LIST} + -DCMAKE_DISABLE_FIND_PACKAGE_LibArchive=ON + -DCMAKE_DISABLE_FIND_PACKAGE_OpenCL=ON + -DLeptonica_DIR=YES + ${OPTIONS_LIST} ) vcpkg_install_cmake() diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 9c88261a6..7cf6005dc 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,5 +1,5 @@ Source: tiff -Version: 4.0.10-6 +Version: 4.0.10-7 Build-Depends: zlib, libjpeg-turbo, liblzma Homepage: https://download.osgeo.org/libtiff Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index d36dce238..373ceac7c 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -33,6 +33,8 @@ vcpkg_configure_cmake( -Djpeg12=OFF -Dwebp=OFF -Dzstd=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_GLUT=ON ${TIFF_CXX_TARGET} ) diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL index 3d2a4337e..6a7b0d216 100644 --- a/ports/xerces-c/CONTROL +++ b/ports/xerces-c/CONTROL @@ -1,5 +1,5 @@ Source: xerces-c -Version: 3.2.2-10 +Version: 3.2.2-11 Homepage: https://github.com/apache/xerces-c Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs. diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index 0350d53ed..214cf971b 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -28,6 +28,7 @@ vcpkg_configure_cmake( -DDISABLE_DOC=ON -DDISABLE_SAMPLES=ON -DCMAKE_DISABLE_FIND_PACKAGE_ICU=${DISABLE_ICU} + -DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON ${XMLCHTYPE} ) |