Closed
Conversation
There was a problem hiding this comment.
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#6
old SHA: 9961bbcc88c934054f6137f3417bbd9cccf478d4
new SHA: cb747fd972aef6934f10eef29d4b625abb1d247a
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
This reverts commit 547abf4.
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout ce99c947b64ea3c0e274e18cc3035ca727681089 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
index df85a0a..b5f5bc8 100644
--- a/versions/o-/opencv4.json
+++ b/versions/o-/opencv4.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "0841e3eb3c81625724e5602535d14b3196597f92",
+ "version": "4.6.0",
+ "port-version": 7
+ },
{
"git-tree": "9961bbcc88c934054f6137f3417bbd9cccf478d4",
"version": "4.6.0",There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout ce99c947b64ea3c0e274e18cc3035ca727681089 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
index df85a0a..e9474e6 100644
--- a/versions/o-/opencv4.json
+++ b/versions/o-/opencv4.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "597f3e6770fb3b9d57e631c00e85f7d4b2c26caa",
+ "version": "4.6.0",
+ "port-version": 7
+ },
{
"git-tree": "9961bbcc88c934054f6137f3417bbd9cccf478d4",
"version": "4.6.0",
Member
Author
|
Closing PR in favor of #27343. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Describe the pull request
What does your PR fix?
Fixes [opencv4] opencv features freetype error #23648After applying patch
0016-fix-freetype-contrib.patch, the build can find freetype and harfbuzz packages. However, the casing mismatches. It generatesfreetype_FOUNDandhardbuzz_FOUNDinstead of the upper casing ones used in opencv-freetype CMakeLists.txt.https://github.com/opencv/opencv_contrib/blob/ff5da1e154ea6e41c2cc77ca98574b3b19318848/modules/freetype/CMakeLists.txt#L9-L21
Thus, this PR adds an additional patch to fix the casing in the remaining part of the CMakelists.txt file.
Which triplets are supported/not supported? Have you updated the CI baseline?
all, NoDoes your PR follow the maintainer guide?
YesIf you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?N/A