Commit Graph

42 Commits

Author SHA1 Message Date
Alexander Neumann
57fee154cc
[opencv4] gen flatbuffers headers (#33191)
* [opencv4] gen flatbuffers headers

* bump ver

* v db
2023-08-16 14:54:28 -07:00
Billy O'Neal
a94dafabca
[opencv4] Update to 4.8.0. (#33048)
* [opencv4] Update to 4.8.0.

* Fix downloads and also bump the metaport.

* Apply arm64-windows build fix from upstream.
2023-08-09 10:05:27 -07:00
autoantwort
7dc921f3ea
[opencv4] fix webp include dir (#31045) 2023-04-24 15:46:08 -07:00
Billy O'Neal
1e68748a7c
[vcpkg baseline][opencv] Let lapack be controlled by the lapack port. (#30883)
Related: #30570.
Alternative to: #30754.
2023-04-17 11:29:30 -07:00
autoantwort
5b11232d00
[many-ports] Don't use deprecated functions (autogenerated) (#26981)
* [libuvc,qt5-virtualkeyboard] remove duplicated dependency entry

* [many-ports] don't use deprecated functions (autogenerated)

* atkmm: Fix license.
gperftools: Reformat vcpkg_check_features call.
gsl: Fix license.
libpff: Fix license.
pangomm: Fix license.
qtbase: Revert, only comment changes.
type-lite: Reformat vcpkg_check_features and actually use the feature options.

---------

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2023-04-13 09:13:15 -07:00
Russell Greene
2a95acc161
[opencv4] add dnn-cuda feature (#29796)
* [opencv4] add dnn-cuda feature

* fmt

* .\vcpkg.exe x-add-version --all
2023-02-24 12:02:54 -08:00
Alexander Neumann
46dda5372b
[vtk|opencv4|openimageio] Switch to Qt6 (#29078)
* Switch stuff to Qt6

* give opencv4 the correct deps

* add Qt5Compat to find_dependency

* refine vtk deps and promote targets to global

* fix dep

* ci is probably faster than my desktop pc building.

* remove invalid patch part

* add qt6 patch

* second patch

* make openimageio ignore qt5

* [skip actions] qt6 part 3

* vtk qt6 patch

* try openimageio again

* move gl include

* fix patch

* does it work now?

* remove qualified name

* more qt6 fixes

* more patches

* update and fix rtabmap

* gles feature in qtbase needs to be disabled for vtk since vtk assumes desktop opengl

* remove patch add error if qtbase was build with gles2

* disable also second patch

* fix theia

* paraview consolidate patches

* fix case issue

* fix missing ,

* add more qt6 changes

* remove unnecessary patches

* bump port version

* remove comments from vtk

* add platform features for tools.

* fix format

* bump ports

* another one to bump

* v db

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2023-01-26 19:19:30 -08:00
Alexander Neumann
9e36a44338
[seacas/vtkm/vtk/paraview] Add/update ports. (#27928)
* [cgns] update to 4.2.0

* [vtk-m] update to 1.6.0

* [vtk] Update to 9.0.1-pv5.9.1
- VTK update to match release version of ParaView

* [ParaView] Update to 5.9.1

* version stuff

* fix automatic svg linkage in static builds

* update qt5-svg

* revisit vtk
- fix build with vtk-m 1.6
- remove unused patches
- remove comments

* bump version

* remove two commented lines

* version stuff

* remove old PR version

* commit stuff

* commit stuff

* update notes

* wip commit

* update paraview

* fix hdf5 patch

* fix patch

* fix patch

* fix portfile

* add mpi feature

* format manifest

* use relativ path

* trace

* retry

* move qml files again

* try with host triplet

* - use VCPKG_CRT_LINKAGE
- use METIS not metis

* fix casing Zlib

* hopefully more fixes on other platforms.

* fix patch

* fix missing ws

* fix typos

* scale down to warning

* revert jsoncpp change
fix zoltan on osx?

* move trace option to failing port

* move trace option to failing port

* Revert "trilinos vcpkg.json changes"

* verdict fix osx build ?

* fix patch

* fix internal find_package call

* also apply correct case for metis

* disable METIS on osx

* vtk-m don't support arm.

* force more features in Ci

* fix missing ,

* more fixes

* more vtk python try and error.

* - paraview python setup same as vtk
- remove openvr from platforms not supporting it
- trace openimageio

* fix case and remove fmt for openimageio.

* trying to fix stuff

* set hash to 0

* [skip actions] add missing module

* WebCore module moved to paraview&python

* fixes

* remove patch in vtk-dicom

* add var to maybe unused

* use correct 5.11 ref instead of the one in release

* Patch cleanup round 1

* remove empty patch parts

* fix vtkm configs

* reintegrate jsoncpp.patch

* fix patch

* add single seacas/kokkos/zoltan ports

* throw out trilinos, zoltan, kokkos
replace trilinos with seacas
make seacas work for dynamic windows

* fix mpi feature

* fix dependency

* retry dep fix

* rename target

* remove double line

* fix target

* fix patch

* retry

* remove cgns config

* fix cgns

* no seacas trace

* lowercase hdf5 target

* fix case of metis

* disable Fortran

* add iotr patch

* add additional config folder

* handel case sensitive Seacas again

* get trace again and force jsoncpp

* update cmake to 3.25.0

* bump port-version

* add patch from vtk upstream

* cleanup, format-manifest

* fix port version

* v db

* opencv4 always inject deps.

* fix test port to not require stuff which is not supported on x86

* Fix HDF5 lookup in opencv4

* only delete bin folder in static builds

* add license field

* v db

* add missing "

* v db

* trace again

* fix rtabmap python dep

* fix openimageio by deleting the find module

* v db

* cr cleanup

* v db

* opencv4 v db due to merge with master. Had to bump port version

* v db

* v db

* v db

* CR comments

* v db for cr comments

* trace theia output

* revert theia trace

* v db

* try without patch

* revert rtabmap changes

* v db after merge

* v db for all
2023-01-19 17:55:56 -08:00
Matthew Oliver
49299e0c05
[opencv4] Update to 4.7.0. (#28949)
* [opencv4] Update t 4.7.0.

* update versions.

* [rtabmap] Support opencv 4.7.

* Update versions.
2023-01-17 11:35:29 -08:00
autoantwort
ec06445e98
[opencv4] no absolute paths (#28203) 2022-12-07 11:31:34 -08:00
Cedric GNIEWEK
4eaa3d2118
[gstreamer] Update to version 1.20.4 and rework (#27790)
* Update to GStreamer v1.20.3

* Fixed gst-plugins-bad * Made optional dependences features * Added webrtc feature

* webrtc dependency fixes

Set meson option 'gst_debug' to true for both debug and release configurations
Enabled dtls and srtp plugins
Fixed srtp plugin

* [gstreamer] Changed version to 1.20.4

* [gstreamer] Reworked port file

* [gst-rtsp-server] Updated to version 1.20.4

* [opencv4] Update GStreamer dependency

* [qtmultimedia] Update GStreamer dependency

* [qtmultimedia] Enabled AVFoundation (part of the Apple Frameworks)

* [qtbase] Fix PCRE2 static linking for GLib

* Added versions

Co-authored-by: Gerard Ryan <gerard.ryan@immersaview.com>
Co-authored-by: David Ely <david.ely@immersaview.com>
2022-11-28 12:09:25 -08:00
Cheney Wang
9db21ff675
[opencv] Enable BUILD_IPP_IW when ipp feature is enable (#27727) 2022-11-10 09:01:39 -08:00
Kai Pastor
f3ab3f6a28
[opencv4] Fix freetype, harfbuzz, gtk dependencies (#27343)
* Fix freetype and harfbuzz dependencies

* Revise gtk feature

* Merge copyright and license files

* Update versions

* Add feature gtk 'supports' expression

* Update versions
2022-10-25 20:49:57 -07:00
Russell Greene
3fb6971261
[OpenCV] Disable quality module on iOS to avoid find_package error (#27287)
* [opencv][ios] disable quality on iOS to avoid a configuration error

* ./vcpkg x-add-version --all
2022-10-18 18:29:19 -07:00
Kai Pastor
94b089b7c1
[openexr] Update from 2 to 3.1.5, patch all consuming ports (#26862)
* Update to 3.1.5

* Add feature 'tools'

* ilmbase is now imath

* [theia] Use openimageio cmake config

* [freeimage] Use OpenEXR 3 and Imath

* [opencv4] Use upstream's OpenEXR 3 support

* [opencv3] Use upstream's OpenEXR 3 support

* [opencv2] Use OpenEXR 3 and Imath

* [osg] Use OpenEXR 3

* [openvdb] Use Imath, enable OpenEXR

* [pangolin] Use OpenEXR 3

* [directxtex] Use OpenEXR 3

* [uvatlas] Disable /guard:ehcont when directxtex uses openexr

* Update versions

Co-authored-by: chausner <chausner@users.noreply.github.com>
2022-09-25 23:45:07 -07:00
Russell Greene
2353c65940
[opencv4] disable optional hdf5 dependency for iOS, where it doesn't build (yet) (#26636)
* [opencv4] diable hdf5 dependency on ios, as it currently doesn't build

* ./vcpkg x-add-version --all
2022-09-02 10:49:22 -07:00
autoantwort
427f956bd5
[opencv4,dv-processing] no absolute paths (#26586) 2022-08-29 11:22:42 -07:00
Stefano Sinigardi
d3431006f2
[tesseract] fix downstream usage (#26378)
* [tesseract5] fix downstream usage

* fix references
2022-08-17 10:41:39 -07:00
Lily Wang
69e4d02ce4
[tesseract] update to 5.2.0 (#26114)
* [tesseract] update to 5.2.0

* x-add-version

* fix windows build error

* version

* fix opencv4 build error

* version

* conflict

* version

* fix opencv build error on uwp

* version

* fix linux build error

* version

* fix

* version

* version
2022-08-15 11:57:44 -07:00
Stefano Sinigardi
acb370dd6d
[OpenCV] update to v4.6.0 (#25431)
* [OpenCV] update to v3.4.18 and v4.6.0
enable python2 in vcpkg-get-python-package

* fix references

* remove python2 from testing

* restore python2 tests only on windows&x64

* fix references

* [OpenCV2] add jasper patch

* fix references

* update handling multiple versions

* add usage files

* [dbow] fix build

* [dbow] fix version

* fix references

* remove ipp from vcpkg-ci-opencv for opencv3

* [OpenCV2] fix CRT linking with static libs

* fix references

* [dbow3] add support clause now that is CI tested
[cctag] enable opencv4, fix build on osx

* fix references

* [OpenCV2] fix patch

* fix references

* [libharu] bump version

* fix references

* [rtabmap] fix for opencv 4.6

* [rtabmap] fix manifest

* fix references

* remove llvm dependency to ease CI load

* version

* overwrite version

* fixes for mingw

* add mingw patch

* fix references

* [OpenCV2] fix generated config on win32

* fix references

* update version

* update version

* overwrite baseline

* cleanup after merge

* fix references

* [openmvs] trying to diagnose the problem - DO NOT MERGE

* fix references

* restore port version

* fix references

* Revert "[openmvs] trying to diagnose the problem - DO NOT MERGE"

This reverts commit 8bfd0ff4f9.

* Revert "fix references"

This reverts commit 0e915f6eef.

* skip opencv2 and opencv3

* remove again opencv2/3 from vcpkg-ci-opencv

* apply fixes from review

* fix references

* wrong checksum (tested on windows)

* Github-actions fixes (#2)

* Update opencv4.json

* fix github-actions issues

* formating vcpkg.json

* update git-trees

* fix rtabmap license

* fix references

* fix also dbow3 license

* fix references

* [cctag] remove unnecessary patch section

* fix references

Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com>
Co-authored-by: FrankXie <v-frankxie@microsoft.com>
Co-authored-by: Matthieu Penant <matthieu.penant@seika.ca>
Co-authored-by: Matthieu Penant <thieum22@hotmail.com>
2022-08-04 17:21:59 -07:00
Jack·Boos·Yu
8408dd9e1e
[vcpkg baseline][opencv4] Fix hash check (#25922)
* [vcpkg baseline][opencv4] Fix hash check

* version
2022-07-22 09:43:26 -07:00
autoantwort
708ed2bb7e
[opencv4,dv-processing] fix pkgconfig (#25621) 2022-07-20 15:07:26 -07:00
LilyWangLL
bde216bf73
[opencv4, opencv3, opencv2] Add feature dc1394 (#24595)
* [opencv4, opencv3] Add feature dc1394

* version

* opencv2 add feature

* version

* update opencv

* x-add-version

* update version

* update test ports

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
2022-06-09 20:11:05 -07:00
hh10k
fd6a336227
[opencv] Fix import paths for debug Android builds (#24394)
* [opencv4] Fix import paths for debug Android builds

* [opencv3] Fix import paths for debug Android builds in the same way as v4

* Only apply changes to OpenCVModules-debug.cmake when it is expected to exist
2022-05-05 10:58:07 -07:00
Alexander Neumann
5afd32266c
[qtinterfaceframework|opencv] fix python stuff (#24041)
* add upstream patch

* [skip actions] add the patch file

* fine tune

* [opencv] update portfiles to use vcpkg-get-python-packages

* fix references

* try another fix

* add all deps

* add code from tensorflow about venv

* retry

* fix file path

* new approach

* unset pythonhome

* next unset

* try this instead.

* retry without the PYTHON_LIB_PATH stuff

* try and error

* next try

* retry

* typo fix

* try updating

* retry

* more try and error

* reorder

* drop qface version

* use qface 2.0.5

* bump watchdog

* fix call on !windows

* fine tuning

* refactor function signature

* update version

* fix formating

* version stuff

* create dir before usage

* fine tuning

* version stuff

* update and patch libilbc

* formating stuff

* fix version-string

* version stuff

* add license

* version update

* bump version

* version stuff

* version stuff

Co-authored-by: Alexander Neumann <you@example.com>
Co-authored-by: Stefano Sinigardi <stesinigardi@hotmail.com>
2022-04-14 11:08:23 -07:00
Kai Pastor
99346bb692
[libwebp] Update, cleanup (#23864)
* Update to v1.2.2

* Fix libwebpmux Windows name breakage

The pc file relies on the original output name:
No 'lib' prefix for MSVC. No 'liblib' prefix for mingw.

* Minor portfile updates

* Don't self-depend on default features

* Fix the libwebpmux feature

* Fix internal tool dependencies

* Drop Xrandr patch (fixed in freeglut)

* Drop X11 patch (fixed in freeglut)

* Cleanup CMake config patch, no extra case hacks

* Adjust webp lib names in skia, qt5-imageformats

* Adjust downstream WEBP cmake usage

* Debug qtimageformats [skip actions]

* [tiff] Drive-by fix for CMake warning

* Drop non-standard debug postfix

* Update indentation

* Update port versions

* Update versions

* Revert qtimageformat debug change

* Fixup qt5-imageformats change

* Update versions
2022-04-13 11:26:56 -07:00
Stefano Sinigardi
e79aaaaf3c
[CUDA, CUDNN] fix support clause (#23900)
* [CUDA, CUDNN] fix support clause

* [cuda] use version key

* [opencv2] format manifest

* fix references

* Update vcpkg.json

* Update vcpkg.json

* Update version database

* Update version database.

* fix feature descriptions

* fix references

* add missing licenses

* fix references

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-04-05 11:50:48 -07:00
Stefano Sinigardi
401578455f
[OpenCV] upgrade to v4.5.5 (#22801)
* [OpenCV4] update to v4.5.5

* [OpenCV] bump version

* [gstreamer] fix build for opencv

* fix references

* [vcpkg-tool-meson] fix nuget packaging

* fix references

* [gstreamer] fix references

* [ogre] update vcpkg tools

* fix references

* [OpenCV4] fixes from CI runs

* fix references

* [OpenCV4] force python module also in debug builds

* fix references

* [harfbuzz] fix cmake config

* harfbuzz fixes

* fix references

* [OpenCV4] remove unnecessary lines from patches

* fix references

* fix references

* [harfbuzz] bump version

* [harfbuzz] fix for single config builds

* fix references

* freetype fixes

* fix references

* fix ogre references

* fix references, again

* python when building static windows opencv libraries is unsupported

* fix references

* fix

* refs

* use required when necessary

* fix references

* do not use config for hdf5, use internal module

* fix references

* use proper spelling for freetype config cmake

* fix references

* [OpenCV] restore versions after merge

* fix references

* [leptonica] fix building

* fix references

* do not require package in optional features

* £fix references

* fix python feat

* update version

* update version

* [ffmpeg] remove opengl feat on arm64-windows

* format manifest

* fix references

* fix cuda/nvidia features compatibility matrix

* fix manifest

* fix

* fix

* fix references

* fix references, again

* move CONTROL to manifest

* [gstreamer] bump versions

* fix references

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
2022-02-23 11:57:13 -08:00
Bobby Reynolds
f54a7b0013
[opencv] Add Patch to Skip ZLIB Hacks (#23132) 2022-02-16 21:54:38 -08:00
Jack·Boos·Yu
ce7ee5ac3c
[opencv4] Disable building cpufeatures since it conflict with libwebp (#22844)
* [opencv4] Disable cpufeatures since it conflict with libwebp

* version
2022-02-04 15:40:49 -08:00
Yury Bura
099507df39
[llvm] update to 13.0.0 (#20749)
* [llvm] update to 13.0.0

* add version

* [llvm] rework processing of the CMake packages

* update versions

* [llvm] return patch to fix config paths

* update version

* [llvm] allow to build Flang on Windows

* add version

* [llvm] temporary enable Flang by default for test

* update version

* [llvm] fix Flang installation

* update version

* [llvm] try to fix Flang build

* update version

* [llvm] remove Flang from defaults and use Perl path

* [halide] update to 13.0.0

* update versions

* [mesa] update to v21.2.5 and fix build with LLVM 13

* [llvm] use version

* update versions

* [opencv4] fix build with Halide 13

* update version

* update ci.baseline

* [halide] update usage file

* [llvm] update supports

* update versions

* [vcpkg-ci-llvm] add test port

* [vcpkg-ci-llvm] rework test port

* [vcpkg-ci-llvm] test more features

* [halide] update to v13.0.1

* update version

* [mesa] recover port version

* update versions

* [opencv4] update version

* update version

* Update opencv4.json

* [halide] update to v13.0.2 and fix usage

* update version

* Update ports/halide/portfile.cmake

Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>

* update version

* enable LLVM ABI breaking checks to avoid Halide build fail

Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
2021-12-20 11:21:15 -05:00
Stefano Sinigardi
54f55a5268
[OpenCV] add python feature (#21854)
* [OpenCV] add python feature

* fix references

* fix references

* [OpenCV] add feature to main port

* [OpenCV] add feature to main port

* fix references

* trying to improve compatibility with *nix env

* fix references

* remove python remnants from vcpkg_checK_features

* fix references
2021-12-08 14:03:00 -08:00
Stefano Sinigardi
f6601ee2e4
[OpenCV] update to v4.5.4 and v3.4.16 (#20658)
* Make gtk4.4 build.

* Update baseline for gtk

* Fix vcpkg version.

* Fix vcpkg version.

* [gtk] Fix macos build.

* [gtk] Fix linux build.

* [gtk] Add patches.

* [gtk] Bump versions - again

* Fix macos patch.

* Bump versions.

* [OpenCV] update to v4.5.4 and v3.4.16

* fix patches

* [OpenCV] fix references

* fix patches

* update references

* add gstreamer support

* fix references

* fixes

* update references

* Install xdamage.

* Bump versions.

* [fontconfig] disable doc building which is failing on bare linux

* fix references

* [opencv] use qt6

* [opencv2] use newer approach to downstream dependency handling

* fix references

* Add merged patch from upstream.

* [gtk] Bump version.

* [OpenCV] restore using qt5

* [opencv] force qt5

* update references

* use a different strategy to find qt5 dependency for downstream projects

* fix references

* use a different strategy to find qt5 dependency for downstream projects also for opencv2

* fix references

* [opencv2] fix patches

* fix references

* Update ports/fontconfig/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* fix references

* fix references, again

* add gtk to linux default features

* fix references

* [OpenCV2] fix cuda patch for newer cuda versions

* fix references

* [OpenCV2] add GTK feature

* fix references

* [opencv2] bump port version

* [opencv2] fix references

* Delete duplicate install of libxdamage-dev

* [fontconfig] bump version

* fix references

* [fontconfig] bump version

* fix references

* move vcpkg-ci-opencv to manifest

Co-authored-by: Berrysoft <Strawberry_Str@hotmail.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-12-01 19:11:01 -08:00
Kai Pastor
15af003194
[opencv4,opencv3] Control exported protobuf dependency (#20550)
* Control exported protobuf dependency

* Update versions

* Control exported protobuf dependency

* Update versions
2021-10-06 16:58:41 -07:00
Carlos O'Ryan
b29f8ef37e
[protobuf] upgrade to latest release (v3.18.0) (#20208)
* [protobuf] upgrade to latest release (v3.18.0)

This requires patching OpenCV as it uses a function removed in the
latest version of protobuf (FWIW, upstream OpenCV has a similar patch).

* The arcus port also needs a patch

* The caffe2 port also needs a patch

* The brpc port also needs a patch
2021-09-22 13:09:55 -07:00
Stefano Sinigardi
09019cbc9a
[OpenCV] fix protobuf references (#19770)
* [OpenCV] fix protobuf targets

* [OpenCV] fix port versions

* [OpenCV] fix references
2021-09-03 22:25:12 -07:00
Stefano Sinigardi
801f40c688
[OpenCV] update to v4.5.3 and to v3.4.15 (#18827)
* [OpenCV] update to v4.5.3 and to v3.4.15

* [OpenCV] update refs

* [libxml2] add missing find_dependency(Iconv)
[libiconv] update cmake wrapper

* [libiconv] fix hints

* [opencv4] do not require cudnn if cuda enabled

* [opencv] update refs

* [OpenCV] increase CI coverage even more

* [vcpkg-ci-opencv] trying to restore x64-uwp ci tests

* restore previous patches to avoid unnecessary modifications

* [OpenCV] fix refs

* [OpenCV] fix CMake Warning related to protobuf dependency

* [OpenCV] fix refs

* [libxml2] fix references

* [libxml2] restore previous cmake wrapper, new one is broken

* [libxml2] fix references

* bump versions

* update refs

* [libxml2] Update the format for vcpkg-cmake-wrapper.cmake

* Update versions/l-/libxml2.json

* [libxml2] update port version

* [libxml2] update refs

* [OpenCV] fix refs

Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
2021-08-13 13:57:28 -07:00
Phoebe
eb9cb29166
[ffmpeg/opencv4] Update opencv4 feature dependency and remove ffmpeg feature 'postproc' from default feature (#19358)
* [ffmpeg/opencv4] Update opencv4 feature dependency and remove ffmpeg feature 'postproc' from default feature

* Update the baseline version

* [opencv3] Update the feature dependency

* Update the baseline

* [opencv2] Update the feature dependency

* Update the baseline version

* Fix uwp build failures

* Update the baseline version

* Fix opencv2 version

* update the baseline version

* update the baseline version

* Un-edit git-tree.

* Update cuda feature

* Update the baseline

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-08-13 08:46:11 -07:00
Stefano Sinigardi
a7d3367cec
[OpenCV] update to 4.5.2 (#18572)
* [OpenCV] update to 4.5.2

* update version refs

* [OpenCV4] fix qt integration

* fix refs
2021-06-21 13:21:02 -07:00
NancyLi1013
6537078e8a
[opencv4] Fix OPTIONS BUILD_opencv_gapi (#17354)
* [opencv4] Fix OPTIONS BUILD_opencv_gapi

* Update version files
2021-04-29 10:45:23 -07:00
Stefano Sinigardi
eb044d1eb5
[OpenCV] bump to 4.5.1 and to 3.4.13 (#15859)
* [OpenCV] bump to 4.5.1 and to 3.4.13

* [OpenCV] fix patches

* [OpenCV] fix hdf5 integration

* [OpenCV] devendor quirc

* fix quirc for downstream ports

* [quirc] fix target export

* update version refs

* [OpenMVG] fix regressions with new opencv

* update version refs

* fix quirc mismatch

* update version refs
2021-01-28 19:23:57 -08:00
Billy O'Neal
80d52af7c8
[quirc, opencv4] Build fixes from 2021-01-18 build (#15788)
* [quirc, opencv4] Use a cmake package for quirc and devendor quirc from opencv4.

* Build fixes from 2020-01-18 build

https://dev.azure.com/vcpkg/public/_build/results?buildId=48065

> PASSING, REMOVE FROM FAIL LIST: chartdir:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: cmark:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: cppcms:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: cudnn:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: devicenameresolver:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: dxut:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: epsilon:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: fann:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: getopt-win32:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: glib:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: graphqlparser:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: halide:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: hpx:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: jemalloc:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: libepoxy:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: libhsplasma:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: libmodman:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: libpcap:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: libplist:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: milerius-sfml-imgui:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: monkeys-audio:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: moos-core:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: msix:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: ngspice:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: openni2:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: openvr:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: pmdk:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: pngpp:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: qpid-proton:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: qt5-tools:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: sciter:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: scylla-wrapper:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: soundtouch:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: spirv-tools:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: torch-th:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: treehopper:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: unrar:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: urdfdom:x64-windows-static-md (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: xalan-c:x64-windows-static-md (.\scripts\ci.baseline.txt)

These look like they have always passed since we turned on x64-windows-static-md in nightly CI.

>PASSING, REMOVE FROM FAIL LIST: osgearth:x64-windows (.\scripts\ci.baseline.txt)
>PASSING, REMOVE FROM FAIL LIST: osgearth:x86-windows (.\scripts\ci.baseline.txt)

Maybe addressed by https://github.com/microsoft/vcpkg/pull/15777

>REGRESSION: gettext:arm-uwp. If expected, add gettext:arm-uwp=fail to .\scripts\ci.baseline.txt.
>REGRESSION: gettext:arm64-windows. If expected, add gettext:arm64-windows=fail to .\scripts\ci.baseline.txt.

Probably fixed by https://github.com/microsoft/vcpkg/pull/15740

> PASSING, REMOVE FROM FAIL LIST: directxmesh:x64-linux (.\scripts\ci.baseline.txt)
> PASSING, REMOVE FROM FAIL LIST: uvatlas:x64-linux (.\scripts\ci.baseline.txt)

Probably an error in the authoring of https://github.com/microsoft/vcpkg/pull/15554/

> REGRESSION: dcmtk:x86-windows. If expected, add dcmtk:x86-windows=fail to .\scripts\ci.baseline.txt.
>
> "C:\PROGRA~2\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x86\cl.exe"   /TP -DDCMTK_BUILD_IN_PROGRESS -DNOMINMAX -DUSE_NULL_SAFE_OFSTRING -D_CRT_FAR_MAPPINGS_NO_DEPRECATE -D_CRT_IS_WCTYPE_NO_DEPRECATE -D_CRT_MANAGED_FP_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_DEPRECATE_GLOBALS -D_CRT_SETERRORMODE_BEEP_SLEEP_NO_DEPRECATE -D_CRT_TIME_FUNCTIONS_NO_DEPRECATE -D_CRT_VCCLRIT_NO_DEPRECATE -D_REENTRANT -D_SCL_SECURE_NO_DEPRECATE -Dofstd_EXPORTS -ID:\installed\x86-windows\include -Iconfig\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\ofstd\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\oflog\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmdata\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmimgle\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmimage\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmjpeg\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmjpls\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmtls\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmnet\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmsr\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmsign\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmwlm\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmqrdb\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmpstat\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmrt\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmiod\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmfg\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmseg\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmtract\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmpmap\include -ID:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\dcmect\include /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP  /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1  -DDEBUG /showIncludes /Foofstd\libsrc\CMakeFiles\ofstd.dir\offilsys.cc.obj /Fdofstd\libsrc\CMakeFiles\ofstd.dir\ofstd.pdb /FS -c D:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\ofstd\libsrc\offilsys.cc
> D:\buildtrees\dcmtk\src\95da808b49-b82aa35f79.clean\ofstd\libsrc\offilsys.cc(376): error C2039: 'DIR': is not a member of '`global namespace''
>
> REGRESSION: tesseract:x64-windows-static-md. If expected, add tesseract:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: tesseract:x64-windows-static. If expected, add tesseract:x64-windows-static=fail to .\scripts\ci.baseline.txt.
> REGRESSION: tesseract:x64-windows. If expected, add tesseract:x64-windows=fail to .\scripts\ci.baseline.txt.
> REGRESSION: tesseract:x86-windows. If expected, add tesseract:x86-windows=fail to .\scripts\ci.baseline.txt.
> [2/241] "C:\PROGRA~2\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x86\cl.exe"   /TP -DHAVE_CONFIG_H -DTESS_EXPORTS -D_CRT_SECURE_NO_WARNINGS -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1 -D__AVX2__ -D__AVX__ -D__BMI2__ -D__FMA__ -D__SSE2__ -D__SSE3__ -D__SSE4A__ -D__SSE4_1__ -D__SSE4_2__ -D__SSSE3__ -Dlibtesseract_EXPORTS -ID:\installed\x86-windows\share\leptonica\..\..\include -ID:\installed\x86-windows\share\leptonica\..\..\include\leptonica -I. -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\api -Iapi -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\arch -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccmain -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccstruct -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccutil -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\classify -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\cutil -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\dict -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\lstm -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\opencl -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\textord -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\viewer -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\wordrec -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\training -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\vs2010\tesseract -ID:\installed\x86-windows\include /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP  /utf-8 /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1  /W4 /bigobj -std:c++17 /showIncludes /FoCMakeFiles\libtesseract.dir\src\classify\shapetable.cpp.obj /FdCMakeFiles\libtesseract.dir\ /FS -c D:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\classify\shapetable.cpp
> FAILED: CMakeFiles/libtesseract.dir/src/classify/shapetable.cpp.obj
> "C:\PROGRA~2\Microsoft Visual Studio\2019\Enterprise\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x86\cl.exe"   /TP -DHAVE_CONFIG_H -DTESS_EXPORTS -D_CRT_SECURE_NO_WARNINGS -D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS=1 -D__AVX2__ -D__AVX__ -D__BMI2__ -D__FMA__ -D__SSE2__ -D__SSE3__ -D__SSE4A__ -D__SSE4_1__ -D__SSE4_2__ -D__SSSE3__ -Dlibtesseract_EXPORTS -ID:\installed\x86-windows\share\leptonica\..\..\include -ID:\installed\x86-windows\share\leptonica\..\..\include\leptonica -I. -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\api -Iapi -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\arch -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccmain -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccstruct -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\ccutil -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\classify -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\cutil -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\dict -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\lstm -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\opencl -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\textord -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\viewer -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\wordrec -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\training -ID:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\vs2010\tesseract -ID:\installed\x86-windows\include /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP  /utf-8 /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1  /W4 /bigobj -std:c++17 /showIncludes /FoCMakeFiles\libtesseract.dir\src\classify\shapetable.cpp.obj /FdCMakeFiles\libtesseract.dir\ /FS -c D:\buildtrees\tesseract\src\4.1.1-3a7d5a1d2b.clean\src\classify\shapetable.cpp
> cl : Command line warning D9025 : overriding '/W3' with '/W4'
> D:\installed\x86-windows\include\params.h(36): error C2143: syntax error: missing ';' before '*'

https://github.com/microsoft/vcpkg/pull/15785

> REGRESSION: fluidsynth:x64-windows-static-md. If expected, add fluidsynth:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.

Was previously a cascaded failure from glib.

REGRESSION: libevent:x86-windows. If expected, add libevent:x86-windows=fail to .\scripts\ci.baseline.txt.

> REGRESSION: ideviceinstaller:x64-windows-static-md. If expected, add ideviceinstaller:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: libcrafter:x64-windows-static-md. If expected, add libcrafter:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: libirecovery:x64-windows-static-md. If expected, add libirecovery:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: moos-essential:x64-windows-static-md. If expected, add moos-essential:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: openmama:x64-windows-static-md. If expected, add openmama:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: sdformat10:x64-windows-static-md. If expected, add sdformat10:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: sdformat6:x64-windows-static-md. If expected, add sdformat6:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: sdformat9:x64-windows-static-md. If expected, add sdformat9:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.

I'm going to assume these were cascaded failures for now.

> REGRESSION: mesa:x64-windows-static-md. If expected, add mesa:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
> REGRESSION: mesa:x64-windows. If expected, add mesa:x64-windows=fail to .\scripts\ci.baseline.txt.
> REGRESSION: mesa:x86-windows. If expected, add mesa:x86-windows=fail to .\scripts\ci.baseline.txt.

Nancy is working on this https://github.com/microsoft/vcpkg/pull/15729

> REGRESSION: quirc:x64-linux. If expected, add quirc:x64-linux=fail to .\scripts\ci.baseline.txt.
> REGRESSION: quirc:x64-osx. If expected, add quirc:x64-osx=fail to .\scripts\ci.baseline.txt.
> Starting package 1166/1442: quirc:x64-linux
> Building package quirc[core]:x64-linux...
> -- Downloading 7e7ab596e4.tar.gz -> dlbeer-quirc-7e7ab596e4d0988faf1c12ae89c354b114181c40.tar.gz...
> -- Extracting source /mnt/vcpkg-ci/downloads/dlbeer-quirc-7e7ab596e4d0988faf1c12ae89c354b114181c40.tar.gz
> -- Using source at /mnt/vcpkg-ci/buildtrees/quirc/src/b114181c40-f1e71e0d5b.clean
> -- Configuring x64-linux-dbg
> -- Configuring x64-linux-rel
> -- Building x64-linux-dbg
> -- Building x64-linux-rel
> -- Installing: /mnt/vcpkg-ci/packages/quirc_x64-linux/share/quirc/copyright/LICENSE
> -- Performing post-build validation
> -- Performing post-build validation done
> Uploaded binaries to 1 HTTP remotes.
> Building package quirc[core]:x64-linux... done
> Installing package quirc[core]:x64-linux...
> The following files are already installed in /mnt/vcpkg-ci/installed/x64-linux and are in conflict with quirc:x64-linux
>
> Installed by opencv4:x64-linux
>     lib/libquirc.a
>
> Elapsed time for package quirc:x64-linux: 2.531 s

Probably broken by https://github.com/microsoft/vcpkg/pull/15089, fix here

> REGRESSION: spatialite-tools:x64-linux. If expected, add spatialite-tools:x64-linux=fail to .\scripts\ci.baseline.txt.
> REGRESSION: spatialite-tools:x64-osx. If expected, add spatialite-tools:x64-osx=fail to .\scripts\ci.baseline.txt.

These are spewing linker errors, probably triggered by https://github.com/microsoft/vcpkg/pull/15768/ although that PR removed them from ci.baseline.txt?

* Fixup spurious / and format-manifest.

* x-add-version

* Add missing =fails.

* Update opencv4 devendor patch for 4.5

* Transform quirc into a feature.

* Repeat changes for opencv3.

* Repeat for opencv. Also fix version for "opencv".

* [dxut] Use vcpkg_from_github, correct "supports",

if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
  message(FATAL_ERROR "DXUT only supports dynamic CRT linkage")
endif()

* [epsilon] Skip in ci.baseline.txt for now because it has "vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)" but also checks against the CRT linkage making the right fix unclear.

* Fix flipped supports:

* Update ports/opencv3/portfile.cmake

* x-add-version

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-01-26 14:33:06 -08:00