Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OpenCV] update to v4.6.0 #25431

Merged
merged 65 commits into from
Aug 5, 2022
Merged

Conversation

cenit
Copy link
Contributor

@cenit cenit commented Jun 25, 2022

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    all, yes

  • Does your PR follow the maintainer guide?

    yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    yes

github-actions[bot]
github-actions bot previously approved these changes Jun 25, 2022
@FrankXie05 FrankXie05 added the category:port-update The issue is with a library, which is requesting update new revision label Jun 27, 2022
@FrankXie05
Copy link
Contributor

Logs from x64-windows :

D:\buildtrees\opencv4\src\4.6.0-b3a3e01510.clean\modules\sfm\src\libmv_light\libmv\simple_pipeline\bundle.cc(552): error C2664: 'void ceres::Problem::SetParameterization(double *,ceres::LocalParameterization *)': cannot convert argument 2 from 'ceres::SubsetManifold *' to 'ceres::LocalParameterization *'
D:\buildtrees\opencv4\src\4.6.0-b3a3e01510.clean\modules\sfm\src\libmv_light\libmv\simple_pipeline\bundle.cc(553): note: Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or parenthesized function-style cast

install-x64-windows-dbg-out.log

github-actions[bot]
github-actions bot previously approved these changes Jun 27, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/libharu/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions[bot]
github-actions bot previously approved these changes Jun 27, 2022
github-actions[bot]
github-actions bot previously approved these changes Jun 27, 2022
github-actions[bot]
github-actions bot previously approved these changes Jun 27, 2022
@cenit
Copy link
Contributor Author

cenit commented Jun 27, 2022

@BillyONeal error on osx is the following:

Building libharu[core,notiffsymbols]:x64-osx...
CMake Error at scripts/cmake/vcpkg_download_distfile.cmake:14 (message):
  

  File does not have expected hash:

          File path: [ /Users/vagrant/Data/downloads/libharu-shading-pr-157.patch ]
      Expected hash: [ 10562c8c9c6975b74d625912e7d3b850376941d5e46136679371ce1315f416b6b8e91d73fd1257b907327b2d71d50b8c026547203f280e42fb7b1901245de03c ]
        Actual hash: [ f2ddb22b54b4eccc79400b6a4b2d245a221898f75456a5a559523eab7a523a87dfc5dfd0ec5fb17a771697e03c7ea6ed4c6095eff73e0a4302cd6eb24584c957 ]

  The cached file SHA512 doesn't match.  The file may have been corrupted.
  To re-download this file please delete cached file at path
  /Users/vagrant/Data/downloads/libharu-shading-pr-157.patch and retry.

Call Stack (most recent call first):
  scripts/cmake/vcpkg_download_distfile.cmake:171 (z_vcpkg_download_distfile_test_hash)
  ports/libharu/portfile.cmake:6 (vcpkg_download_distfile)
  scripts/ports.cmake:146 (include)


error: building libharu:x64-osx failed with: BUILD_FAILED

it looks like the osx pipeline is not cleaning the downloads folder??

@BillyONeal
Copy link
Member

it looks like the osx pipeline is not cleaning the downloads folder??

They shouldn't clear the downloads folder because users don't clear downloads folders either. We should change the name of the file for the new SHA.

github-actions[bot]
github-actions bot previously approved these changes Jun 28, 2022
github-actions[bot]
github-actions bot previously approved these changes Jun 28, 2022
github-actions[bot]
github-actions bot previously approved these changes Jun 28, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/opencv/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions[bot]
github-actions bot previously approved these changes Jun 28, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/opencv/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions[bot]
github-actions bot previously approved these changes Jun 28, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/opencv/vcpkg.json
  • scripts/test_ports/vcpkg-ci-opencv/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions[bot]
github-actions bot previously approved these changes Jun 28, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/opencv/vcpkg.json
  • scripts/test_ports/vcpkg-ci-opencv/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for opencv4 have changed but the version was not updated
version: 4.6.0
old SHA: fbe591743e0340229f0e9fc6132f8af8736705e6
new SHA: bbd5a8949435a95137f7970fb734f3e18cd9ceb0
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
error: checked-in files for opencv2 have changed but the version was not updated
version: 2.4.13.7#14
old SHA: b89a2a7aa58c1d70a0f36db3618570dfb899330e
new SHA: 83cd03cdf262a9ecd38df7c585edd83f3cbbec4e
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/opencv/vcpkg.json
  • scripts/test_ports/vcpkg-ci-opencv/vcpkg.json

Valid values for the license field can be found in the documentation

github-actions[bot]
github-actions bot previously approved these changes Jun 30, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/opencv/vcpkg.json
  • scripts/test_ports/vcpkg-ci-opencv/vcpkg.json

Valid values for the license field can be found in the documentation

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for opencv4 have changed but the version was not updated
version: 4.6.0
old SHA: d899e0fe819a033d94f41acddcdd2a6232217bd0
new SHA: 1ff543272c91a32d242ad5320e9ca63b29b34ed2
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/dbow3/portfile.cmake

You have modified or added at least one vcpkg.json where you should check the license field.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/dbow3/vcpkg.json
  • ports/opencv/vcpkg.json
  • ports/rtabmap/vcpkg.json

Valid values for the license field can be found in the documentation

* Update opencv4.json

* fix github-actions issues

* formating vcpkg.json

* update git-trees
github-actions[bot]
github-actions bot previously approved these changes Aug 3, 2022
github-actions[bot]
github-actions bot previously approved these changes Aug 3, 2022
github-actions[bot]
github-actions bot previously approved these changes Aug 3, 2022
@cenit
Copy link
Contributor Author

cenit commented Aug 3, 2022

Hmm, looks like a patch failure?

should be fixed now

@Cheney-W Cheney-W added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Aug 4, 2022
Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you submit upstream PRs for most of these patches? They generally don't seem to be vcpkg-specific.

#ifndef _CCTAG_EXCEPTIONS_HPP_
#define _CCTAG_EXCEPTIONS_HPP_
-
+#define _GNU_SOURCE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please submit a PR to https://github.com/alicevision/CCTag ?

message("/usr/bin/python2 get-pip.py")
message("and finally")
message("pip install virtualenv")
message("On some system, these commands must be run as root, otherwise error about virtualenv module missing will persist!")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
message("On some system, these commands must be run as root, otherwise error about virtualenv module missing will persist!")
message("On some systems, these commands must be run as root, otherwise error about virtualenv module missing will persist!")

vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/public/get-pip.py" --no-warn-script-location
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
LOGNAME "get-pip-${TARGET_TRIPLET}")
elseif(arg_PYTHON_VERSION STREQUAL 2)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:sigh: I'm not going to completely block over this but I hate doing anything in support of something that's irresponsible to use because it's out of support for 2 years.

@BillyONeal BillyONeal merged commit acb370d into microsoft:master Aug 5, 2022
@BillyONeal
Copy link
Member

Thanks for the update :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants