-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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
Fix opencv-freetype build #27322
Fix opencv-freetype build #27322
Conversation
There was a problem hiding this 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#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.
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!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout ce99c947b64ea3c0e274e18cc3035ca727681089 -- versions
./vcpkg x-add-version --all
Diff
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.
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!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout ce99c947b64ea3c0e274e18cc3035ca727681089 -- versions
./vcpkg x-add-version --all
Diff
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",
Closing PR in favor of #27343. |
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_FOUND
andhardbuzz_FOUND
instead 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, No
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?N/A