[opencv4] update to v4.3 #11130

cenit · 2020-05-02T16:03:18Z

It should be complete now

Fixes: #11557
Closes: #8557
Fixes: #11138
Fixes: #10188
Closes: #8655
Closes: #8549
Closes: #3196
Fixes: #7981
Closes: #7913
Closes: #7856
Fixes: #4907
Closes: #9607
Fixes: #7572
Closes: #8175

cenit · 2020-05-03T15:58:39Z

ports/ffmpeg/FindFFMPEG.cmake.in

+endif()
+
+if(UNIX AND NOT APPLE)
+  list(APPEND FFMPEG_PLATFORM_DEPENDENT_LIBS -lX11)


note for future me: Maybe this change in FindFFMPEG.cmake has to be done only on macOS Catalina, since I remember linking to X11 as necessary also on previous versions of osx?

We also need to update version for ffmpeg.

BillyONeal · 2020-05-06T17:41:49Z

/azp run

azure-pipelines · 2020-05-06T17:42:09Z

Pull request contains merge conflicts.

cenit · 2020-05-06T18:04:01Z

merged with master 😉

NancyLi1013 · 2020-05-07T02:14:38Z

It seems that dbow2 and fribidi have passed on osx pipeline.

Could you please remove dbow2:x64-osx=fail and fribidi:x64-osx from ci.baseline.txt?

##[error]PASSING, REMOVE FROM FAIL LIST: dbow2:x64-osx 
##[error]PASSING, REMOVE FROM FAIL LIST: fribidi:x64-osx

The regressions on osx

libass failed on x64-osx due to this:

/Volumes/data/work/1/s/buildtrees/libass/src/ebd911d5ca-39016ec3fc/libass/ass_directwrite.c:23:10: fatal error: 'initguid.h' file not found
#include <initguid.h>
         ^~~~~~~~~~~~
1 error generated.

The regressions on windows

openexr failed on x64-windows and x86-windows due to this:

ninja: error: build.ninja:687: multiple rules generate IlmBase/Half/Half-2_3_d.lib [-w dupbuild=err]

ports/opencv4/portfile.cmake

pthom · 2020-05-09T12:58:15Z

This PR helps to solve some issues for opencv4 under android, and it almost succeeds under android.

However, the final step fails because of the presence of two "README.android" files in the package folder:

> tree packages/opencv4_arm-android -L 2
packages/opencv4_arm-android
├── BUILD_INFO
├── debug/
│   ├── lib/
│   └── README.android
├── include/
│   └── opencv2/
├── lib/
│   ├── libopencv_calib3d.so
│   ├── libopencv_core.so
│   └── ...
├── README.android
└── share/
    ├── opencv
    └── opencv4

How to reproduce

cherry pick a recent (merged) PR where I corrected protobuf:android
git cherry pick fcdac2dc1
Install android ndk
Set ANDROID_NDK_HOME env variable, for example:
export ANDROID_NDK_HOME=/home/YourAccount/Android/Sdk/ndk-bundle
Create the android triplets : use the ready to use script provided here
vcpkg install opencv4, and select only the core module (because of a bug inside png:android):
./vcpkg install "opencv4[core]:arm-android"

A possible solution (which I tested)

inside "ports/opencv4/portfile.cmake", add this before the final line (file(INSTALL ${SOURCE_PATH}...)

if(${VCPKG_CMAKE_SYSTEM_NAME} STREQUAL "Android")
  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/README.android)
  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/README.android)
endif()

cenit · 2020-05-09T14:27:28Z

I will add your final lines for sure. Removing those readme is not dangerous at all

JackBoosY · 2020-07-20T03:02:44Z

The analysis of CONTROL is now more strict, caused this error.

cenit · 2020-07-21T05:10:30Z

Wonderful, thanks for finding the root issue of the ci failure

JackBoosY · 2020-07-23T09:09:45Z

@ras0219-msft Since this PR lasts too long, please merge this PR first.

ports/opencv4/CONTROL

cenit · 2020-07-24T05:48:30Z

What’s going on with all of these regressions?!??

talregev · 2020-07-24T11:11:45Z

@cenit It hard to find the place we talk. Thank you for the explanation.

cenit · 2020-07-24T13:02:31Z

OpenCV 4.4 has been released.
I am unsure if I should keep insisting on 4.3 or upgrade here already to 4.4 and hope for its merging before 4.5 🤣 ...

talregev · 2020-07-24T13:28:34Z

@cenit You should stay with 4.3. After it will merge, please also do 4.4. Thank you.

talregev · 2020-07-26T14:22:51Z

@cenit Can you tell me what the status of this PR?

JackBoosY · 2020-07-27T02:24:49Z

@cenit Please update after merge this PR.

@ras0219-msft Ping for merge this PR.

dan-shaw · 2020-07-28T00:46:33Z

Thanks to everyone who worked on this PR!

* [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 <[email protected]> * Update ports/opencv3/portfile.cmake Co-authored-by: Jack·Boos·Yu <[email protected]> * 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 (microsoft#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 <[email protected]> Co-authored-by: Jack·Boos·Yu <[email protected]>

cenit added 2 commits May 2, 2020 18:02

[opencv4] draft update to v4.3

b6dcbec

restore uwp patch

d4650da

cenit force-pushed the dev/cenit/opencv43 branch from b567b05 to d4650da Compare May 2, 2020 22:20

cenit added 7 commits May 3, 2020 10:25

fix qt and ipp features

3b36877

fix libepoxy and meson on osx

c466ead

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

4f70b79

remove jpeg feature on windows due to a bug with MSVC

c949820

minor fixes for some features

1bb1a69

ffmpeg x11 lib not required anymore on apple for downstream projects

480f36f

small fixes for ogre and qt5

6467a98

cenit commented May 3, 2020

View reviewed changes

cenit added 5 commits May 3, 2020 19:05

remove a broken module

82700cb

fix installation path

474dfac

Merge branch 'master' into dev/cenit/opencv43

04e6a0d

fix openexr which was broken and regressed opencv downstream projects

525fd44

first round of ci passes

1aa398b

LilyWangL requested a review from NancyLi1013 May 6, 2020 01:57

LilyWangL assigned NancyLi1013 May 6, 2020

merge with master

fc33abf

NancyLi1013 mentioned this pull request May 7, 2020

[opencv4] Changed dependency on qt5 to qt5-base, closes microsoft/vcpkg#11138 #11201

Merged

NancyLi1013 suggested changes May 7, 2020

View reviewed changes

ports/opencv4/portfile.cmake Outdated Show resolved Hide resolved

NancyLi1013 mentioned this pull request May 9, 2020

[opencv4] LINK : fatal error LNK1168: cannot open bin\opencv_mld.dll for writing #11075

Closed

cenit mentioned this pull request May 9, 2020

[opencv4:android]: Correct paths in portfile #11269

Closed

pthom mentioned this pull request May 9, 2020

[opencv4:android] build failure (folder /include is empty or not present) #11229

Closed

JackBoosY added 2 commits July 19, 2020 19:49

Update ports/freeimage/CONTROL

f987743

Update ports/freeimage/CONTROL

dbfe6cc

NancyLi1013 mentioned this pull request Jul 20, 2020

openCV debug mode LNK2019 / LNK1120 error #12487

Closed

JackBoosY approved these changes Jul 23, 2020

View reviewed changes

JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Jul 23, 2020

RadwanIbrahim reviewed Jul 23, 2020

View reviewed changes

ports/opencv4/CONTROL Outdated Show resolved Hide resolved

[opencv3/4] avoid tesseract dependency on uwp builds

9b1eff5

cenit mentioned this pull request Jul 24, 2020

[OpenMVG/OpenMVS] fix tools #12229

Merged

[opencv] add missing module search

883fc2d

cenit requested a review from NancyLi1013 July 24, 2020 07:29

JackBoosY removed the info:reviewed Pull Request changes follow basic guidelines label Jul 24, 2020

NancyLi1013 approved these changes Jul 24, 2020

View reviewed changes

JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Jul 27, 2020

JackBoosY mentioned this pull request Jul 27, 2020

Building Opencv4 is successful but doesn't download opencv_ffmpeg.dll and gives no error until you try to use video capture #12587

Closed

dan-shaw approved these changes Jul 27, 2020

View reviewed changes

ras0219-msft approved these changes Jul 28, 2020

View reviewed changes

strega-nil merged commit f1e7a3f into microsoft:master Jul 28, 2020

cenit deleted the dev/cenit/opencv43 branch July 28, 2020 06:23

NancyLi1013 mentioned this pull request Jul 28, 2020

[openexr] update to <2.4> #9607

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[opencv4] update to v4.3 #11130

[opencv4] update to v4.3 #11130

cenit commented May 2, 2020 •

edited

Loading

cenit May 3, 2020 •

edited

Loading

NancyLi1013 Jul 6, 2020

BillyONeal commented May 6, 2020

azure-pipelines bot commented May 6, 2020

cenit commented May 6, 2020

NancyLi1013 commented May 7, 2020

pthom commented May 9, 2020

cenit commented May 9, 2020

JackBoosY commented Jul 20, 2020

cenit commented Jul 21, 2020

JackBoosY commented Jul 23, 2020

cenit commented Jul 24, 2020

talregev commented Jul 24, 2020

cenit commented Jul 24, 2020

talregev commented Jul 24, 2020

talregev commented Jul 26, 2020

JackBoosY commented Jul 27, 2020

dan-shaw commented Jul 28, 2020

[opencv4] update to v4.3 #11130

[opencv4] update to v4.3 #11130

Conversation

cenit commented May 2, 2020 • edited Loading

cenit May 3, 2020 • edited Loading

Choose a reason for hiding this comment

NancyLi1013 Jul 6, 2020

Choose a reason for hiding this comment

BillyONeal commented May 6, 2020

azure-pipelines bot commented May 6, 2020

cenit commented May 6, 2020

NancyLi1013 commented May 7, 2020

The regressions on osx

The regressions on windows

pthom commented May 9, 2020

cenit commented May 9, 2020

JackBoosY commented Jul 20, 2020

cenit commented Jul 21, 2020

JackBoosY commented Jul 23, 2020

cenit commented Jul 24, 2020

talregev commented Jul 24, 2020

cenit commented Jul 24, 2020

talregev commented Jul 24, 2020

talregev commented Jul 26, 2020

JackBoosY commented Jul 27, 2020

dan-shaw commented Jul 28, 2020

cenit commented May 2, 2020 •

edited

Loading

cenit May 3, 2020 •

edited

Loading