New: Usr: Added opencv/4.5.0 #3409
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Failure in build 1 (
|
|
Failure in build 2 (
|
|
Ok, so it seems I have to move gtkmm to its separate |
recipes/opencv/4.x/conanfile.py
Outdated
| if self._cmake: | ||
| return self._cmake | ||
| self._cmake = CMake(self) | ||
| self._cmake.definitions['CMAKE_CXX_STANDARD'] = '11' |
There was a problem hiding this comment.
This looks a little suspicious =? Is this not managed by conan?
There was a problem hiding this comment.
It was originally there as a patch for openEXR in 2.4.13.7 that I rewrote. I will retest, it probably does not need to be there anymore.
There was a problem hiding this comment.
Ok, tested and it seems to be spurious indeed. I removed it.
recipes/opencv/4.x/conanfile.py
Outdated
|
|
||
| add_components([ | ||
| {"target": "opencv_core", "lib": "core", "requires": ["zlib::zlib"] + tbb()}, | ||
| {"target": "opencv_flann", "lib": "flann", "requires": ["opencv_core"] + tbb()}, |
There was a problem hiding this comment.
if core requires tbb does it need to be repeated everywhere?
There was a problem hiding this comment.
Also a good point! I also took this literally from the 2.4.13.7 conanfile. I assumed they would have a good reason to do this. I am not sure how I can test this and be sure it can go (the test_package isn't using tbb).
There was a problem hiding this comment.
Yes, it's listed for all targets. I've commented on 2.4.13.7 PR, but you can check all cmake target files here: https://gist.github.com/uilianries/e5de90e8df47b0bd6eae25a25e334c5c
|
Failure in build 3 (
|
|
Some configurations of 'opencv/4.5.0' failed in build 4 (
|
|
#3410 should fix the missing system dependency. |
|
Please refrain from the squash, it makes it more difficult to review the PR 🙏 |
|
Some configurations of 'opencv/4.5.0' failed in build 5 (
|
|
Some configurations of 'opencv/4.5.0' failed in build 6 (
|
ghost
mentioned this pull request
|
I detected other pull requests that are modifying opencv recipe: This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there. |
Signed-off-by: Uilian Ries <uilianries@gmail.com>
|
Hi @bverhagen I'm doing some changes for your PR, please wait, I should open new PR for you today. |
Signed-off-by: Uilian Ries <uilianries@gmail.com>
Signed-off-by: Uilian Ries <uilianries@gmail.com>
|
Hi @bverhagen!! Please consider bverhagen#1 I've added some improvements, including Contrib support. |
Improve OpenCV 4.x
|
Failure in build 7 (
|
|
Some configurations of 'opencv/4.5.0' failed in build 8 (
|
uilianries
reviewed
Nov 18, 2020
This was referenced Nov 19, 2020
Co-authored-by: Uilian Ries <uilianries@gmail.com>
|
Some configurations of 'opencv/4.5.0' failed in build 10 (
|
uilianries
reviewed
Nov 19, 2020
Co-authored-by: Uilian Ries <uilianries@gmail.com>
|
All green in build 11 (
|
|
|
||
| def parallel(): | ||
| if self.options.parallel: | ||
| return ["tbb::tbb"] if self.options.parallel == "tbb" else ["openmp"] |
There was a problem hiding this comment.
How does openmp work? we do not have a self.requires("...") for openmp but we add it self.cpp_info.components[conan_component].requires = requires
| self._cmake.definitions["WITH_OPENCL_SVM"] = False | ||
| self._cmake.definitions["WITH_OPENGL"] = False | ||
| self._cmake.definitions["WITH_OPENJPEG"] = False | ||
| self._cmake.definitions["WITH_OPENMP"] = False |
There was a problem hiding this comment.
it's also disabled here 🤔
There was a problem hiding this comment.
Nvm, it's enabled later!
prince-chrismc
approved these changes
Nov 20, 2020
madebr
approved these changes
Nov 21, 2020
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #3313
Specify library name and version: opencv/4.5.0
conan-center hook activated.
Many thanks to all contributors to opencv/2.4.13.7 in conan-center-index, whose work I used as a basis. It is not feature-complete, but supports the same options as 2.4.13.7 and can be used a basis for further enabling further opencv features and releases.