Commit Graph

13 Commits

Author SHA1 Message Date
Stefano Sinigardi
eb183171d2
[cmake] upgrade to 3.18 (#12612)
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-10-19 17:18:39 -07:00
Stefano Sinigardi
f1e7a3f167
[opencv4] update to v4.3 (#11130)
* [opencv4] draft update to v4.3

* restore uwp patch

* fix qt and ipp features

* fix libepoxy and meson on osx

* fix baseline, trigger a full rebuild due to meson tool changes

* remove jpeg feature on windows due to a bug with MSVC

* minor fixes for some features

* ffmpeg x11 lib not required anymore on apple for downstream projects

* small fixes for ogre and qt5

* remove a broken module

* fix installation path

* fix openexr which was broken and regressed opencv downstream projects

* first round of ci passes

* improve compatibility with android toolchain

* [openexr] upgrade to v2.5.0 to fix regressions, might require fixes in dependent projects and might deserve its own PR

* fix OpenEXR link for downstream projects

* do not install unrequested features

* fix compatibility with newer OpenEXR

* [OpenCV3] update to v3.4.10

* fix openexr on windows, was creating symlinks that broke vcpkg

* fix openexr wrapper

* [openexr] cmake config files are installed into a lowered-case folder

* remove mangled paths trying to fix android setup

* disable dnn on android, fix mangled cmake config paths again

* fix downstream CUDA dependency

* fix compatibility with vs16.6

* remove from baseline ports now passing tests

* [alembic] fixes for new openexr

* fix baseline

* [field3d] fixes for new openexr

* [field3d] improve fixes, windows still unsupported despite what is said upstream

* apply fixes required from review

* add missing field3d patch

* [field3d] disable mpi integration

* [opencv2] remove cublas integration

* [vtk] do not create libharu::libharu target if already existing

* Update ports/opencv4/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Update ports/opencv3/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* improve compatibility with newer CUDNN

* [OpenCV3, OpenCV4] improve compatibility with CUDA 11

* [OpenCV2] improve compatibility with CUDA 11

* [field3d] regenerate patch ignoring space at eol

* [vcpkg] Use SSH keys instead of password authentication when minting Linux scale sets (#11999)

* [field3d] regenerate patch ignoring space at eol

* [field3d] regenerate patch, again

* [field3d] fixes for windows

* [libass] fix regression

* ci.baseline.txt update

* [CUDA11] use FindCUDA from CMake 3.18 to ease transition later

* re-bump vtk and ffmpeg, which were lost with merges from master

* [OpenCV4] Halide feature is not broken anymore

* [field3d] regenerate hdf5 patch

* [OpenCV4] remove GTK features: it can be built only on *nix but GTK on vcpkg cannot be built on *nix systems...

* merge ci.baseline.txt from master and fix field3d patch

* remove rebuilding

* restore vtk CONTROL file

* update CONTROL files

* Trigger rebuild

* Update ports/freeimage/CONTROL

* Update ports/freeimage/CONTROL

* [opencv3/4] avoid tesseract dependency on uwp builds

* [opencv] add missing module search

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
2020-07-27 17:43:23 -07:00
Alexander Neumann
3bffe1c049
[qt5] update qt to 5.15 and make ports depend on qt5-base[core]. (#11596)
* [qt5] update qt to 5.15 and make ports depend on qt5-base[core].

* [qt5] update and remove patches

* [baseline] skip qt5-canvas3d due to deprecation

* [qwt] update to 6.1.4 and fix build issues

* [qt5-webengine] remove old patches

* [qwt] fix static patch

* [qt5-location] add a message that the port has a sprious failure

* [qt5-webengine] fix filename of patch

* [qt5-webengine] add build.patch (ci is probably fast than me in checking for more errors)

* [qt5-winextras] depend on qt5-base[core]

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* [qt5-base] update latest feature (latest=core)

* [baseline] remove qt5-webengine for nonstatic windows since CI can handle it now

* [qt5-base] make qt5-base fail to get logs.

* [angle] include missing egl sources.

* [qt5-base] patch egl detection logic.

* [baseline] remove qt-x11extras:x64-linux=fail

* [qt5-base] need to be explicit about xcb to build qt5-x11extras

* [CI] add necessary system libraries to linux CI

* [qt5-base] remove comment to retry on linux

* [qt5-base] add static_init patch for MSVC

* [qt5-base] refined workaround to not regress linux and osx due to

* [paraview] remove unnecessary patches with newer qt versions

* [vcpkg/baseline] add webengine back to skip

* [vtk] fix missing include regression using patch from upstream

* [vtk] fix patch

* [qt5-base] replace with patch from upstream

* [paraview] use hdf5 1.10 api.

* [paraview] bump control

* Add more packages to Linux machines.

* [qt5-base] forgot to add the patch

* Delete 6943.diff

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-07-08 15:34:35 -07:00
Don Venable
58560e53d8
[opencv2,opencv3,opencv4] Changed dependency on qt5 to qt5-base, fixes #11138 (#11201)
* Changed dependency on qt5 to qt5-base, closes microsoft/vcpkg#11138

* Bump the correct control file.

* Also added qt5-base as dep for opencv3, bumped version

* Changed dep for `qt` feature from `qt5` to `qt5-base`, bumped ver

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2020-05-08 13:57:24 -07:00
Stefano Sinigardi
7a0c97b6b3
[OpenCV2] add new "old" port (#7849)
* [OpenCV2] add library for older C projects

* [OpenCV2] fixes for non-Windows systems

* [OpenCV2] add warnings for Ubuntu

* add fixes for cuda

* [OpenCV2] disable parallel building, otherwise cuda fails

* [OpenCV2] refresh port with latest fixes

* [OpenCV2] fix CONTROL

* [OpenCV2] fixes for windows

* [OpenCV2] fixes to avoid unnecessary install of pre-built ffmpeg, since it already uses externally provided one

* [OpenCV2] openexr still has some problems, explicitly removed UWP support

* [OpenCV2] use targets wherever possible. Jasper and OpenEXR features would require improvements in those ports, in order for them to provide targets too

* [OpenCV2] re-enable parallel build also with CUDA

* [OpenCV2] improve compatibility with CUDA 10+

* [OpenCV2] fix broken CUDA targets

* [darknet] enable opencv2 feature

* skip from building, like opencv3, to avoid problems in CI
2020-05-06 15:26:16 -07:00
Victor Romero
df4773c056
Revert "[opencv3] Upgrade to version 3.4.8 (#8623)" (#8911)
This reverts commit df266bd067.
2019-11-05 10:24:02 -08:00
Lily
df266bd067 [opencv3] Upgrade to version 3.4.8 (#8623) 2019-11-04 11:23:37 -08:00
Stefano Sinigardi
999c198334 [opencv] add tesseract to fix downstream linking 2019-10-10 11:14:29 +02:00
Stefano Sinigardi
3532a7cf3c [cudnn] add port and enable it in darknet (#7536)
* [cudnn] add port and enable it in darknet
* [OpenCV4] fix ffmpeg feature on uwp
* [darknet] enable integration with cuda/cudnn also with opencv3
* [darknet] update to latest revision
2019-09-24 12:58:38 -07:00
JackBoosY
3b2bd689ed [opencv3]Add feature option ${FEATURE_OPTIONS} to vcpkg_configure_cmake. (#7925) 2019-08-27 14:09:02 -07:00
Stefano Sinigardi
d85a40d478 [OpenCV 3] update to v3.4.7 (#7658)
* [opencv3] uniform CONTROL file with opencv4 port

* [opencv3] uniform portfile with opencv4

* [opencv3] uniform CONTROL file with opencv4 port

* [opencv3] update to 3.4.7 draft

* [OpenCV 3] wip to uniform port to opencv4 standards

* [OpenCV3] fix IPPICV integration, use the same mechanism as in OpenCV4 port

* [OpenCV3] fix sfm module

* [OpenCV3] update hunk references in patches 0001 and 0009

* [OpenCV3] refresh install options to adhere to opencv4 standards

* [opencv3] remove leftovers

* [opencv3] Use OUT_FEATURE_OPTIONS with vcpkg_check_features()
2019-08-23 12:48:09 -07:00
NiHoel
de3d6b5c26 Fix building feature opencv halide (#7581)
* Add feature halide to OpenCV.

* Add dependency of opencv[halide] to opencv[dnn].

* Fix building opencv[halide].

* Only require opencv[dnn] not default features.

* Migration to opencv4 port.

* [opencv] Normalize line endings in CONTROL file

* [opencv] Normalize line endings in CONTROL file
2019-08-16 17:16:17 -07:00
Stefano Sinigardi
4fb51523e9 [OpenCV] Update to v4.1.1 (#5169)
* [OpenCV] update to v4

* [OpenCV] update to v4.1

* [OpenCV] merge #6901 and #6812

* [OpenCV] port patches to v4.1

* [OpenCV] fix naming

* [OpenCV] fix regression with static linkage

* [OpenCV] fix linking to optional feature dependencies in static mode

* fix ffmpeg on some architectures

* trigger rebuild of regressions on macOS

* [zxing-cpp] fix opencv 4.1 compat

* [ogre] improve patching for static builds

* [OpenCV] fixes for extra features

* [OpenCV] drastically reduce patchset

* [OpenCV] fix regression on linux

* [OpenCV] fix regression on Windows

* [qt5] depends on qt5-activeqt only on windows

* update to v4.1.1

* [OpenCV] additional fixes for 4.1.1

* [OpenCV] fix Eigen3 feature integration

* [opencv] Fix compilation in UWP

* [opencv] Fix merge conflicts

* [ffmpeg] fix cmake module for osx

* [OpenCV] add pre-caching of optflow cuda package

* [gdcm] properly fix #6863 instead of wrong #6901

* [OpenCV] fix OpenMP feature

* [opencv] Add missing GetModuleHandle() call guard for UWP

* [freeimage] Do not depend on libwebp[all] on UWP

* [opencv] Set app container bit for UWP

* [zxing-cpp] Fail with explicit message in UWP

* [pthreads4w] fix target creation, missing dlls

* [pthreads4w] bump CONTROL

* [opencv,zxing-cpp] Fix OpenCV Video IO module

* [zxing-cpp] Revert unnecessary changes

* [opencv] Feature halide

* Fix regression in UWP

* [ffmpeg] remove unnecessary patch pointing to old OpenCV version

* [opencv] remove versioning from windows dll filenames

* [opencv] Move port to opencv4

* [opencv,opencv4] Make meta-package install OpenCV 4.1

* [opencv3] Rename old port opencv->opencv3

* Add failure messages when another OpenCV is already installed
2019-08-12 09:22:30 -07:00