Skip to content

[OpenCV] update to v4.5.4 and v3.4.16#20658

Merged
BillyONeal merged 72 commits intomicrosoft:masterfrom
cenit:dev/cenit/opencv454
Dec 2, 2021
Merged

[OpenCV] update to v4.5.4 and v3.4.16#20658
BillyONeal merged 72 commits intomicrosoft:masterfrom
cenit:dev/cenit/opencv454

Conversation

@cenit
Copy link
Contributor

@cenit cenit commented Oct 11, 2021

fixes: #12621
fixes: #20991

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!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 973a7d517c09c8cfb7e6a548fcc260ca34ba7b60 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 7808840..ee36f84 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4809,7 +4809,7 @@
       "port-version": 2
     },
     "opencv": {
-      "baseline": "4.5.3",
+      "baseline": "4.5.4",
       "port-version": 0
     },
     "opencv2": {
@@ -4817,12 +4817,12 @@
       "port-version": 6
     },
     "opencv3": {
-      "baseline": "3.4.15",
-      "port-version": 3
+      "baseline": "3.4.16",
+      "port-version": 0
     },
     "opencv4": {
-      "baseline": "4.5.3",
-      "port-version": 3
+      "baseline": "4.5.4",
+      "port-version": 0
     },
     "opendnp3": {
       "baseline": "3.1.0",
diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json
index c648300..c130efd 100644
--- a/versions/o-/opencv.json
+++ b/versions/o-/opencv.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fc004ca8177b867e3e7ebba23c9ed66cd7f2fb18",
+      "version": "4.5.4",
+      "port-version": 0
+    },
     {
       "git-tree": "5b13218917e1efe74e37b28a13cfc8cc7572241e",
       "version": "4.5.3",
diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json
index 8356204..04b8263 100644
--- a/versions/o-/opencv3.json
+++ b/versions/o-/opencv3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d203df7d68c5dd4915832eb2f803c755f1ad529d",
+      "version": "3.4.16",
+      "port-version": 0
+    },
     {
       "git-tree": "dee8e4cb055e92ed1708903f73dcca96b0793fe5",
       "version": "3.4.15",
diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json
index 8c909b6..0e4eee4 100644
--- a/versions/o-/opencv4.json
+++ b/versions/o-/opencv4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e4d52899f1eb0e8574350344684c9ae85cb4c20a",
+      "version": "4.5.4",
+      "port-version": 0
+    },
     {
       "git-tree": "d48f3aabd1d417854360efb92874f3b533f83966",
       "version": "4.5.3",

@JonLiu1993 JonLiu1993 self-assigned this Oct 12, 2021
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Oct 12, 2021
@cenit cenit marked this pull request as ready for review October 12, 2021 16:04
@cenit
Copy link
Contributor Author

cenit commented Nov 16, 2021

Don't know what you mean by this.

how much influence other ms teams might have in deciding sprints in ado agile development ;)
your use case is pretty much standard, if it does not work very well already it might deserve a call, maybe you get heard more than outsiders :)

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: Local changes detected for fontconfig but no changes to version or port version.
-- Version: 2.13.94#1
-- Old SHA: 606b2d7ca0ba11e29552311100b66d8c5052faeb
-- New SHA: a80ed0a85c2cb1cbc1c42f71f9979bcfacd0cabc
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

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: Local changes detected for fontconfig but no changes to version or port version.
-- Version: 2.13.94#2
-- Old SHA: bc9133bf9d7f323757e7de9992ae6dbac0a92f00
-- New SHA: 20f42a020eacf70286407becf634f9c98aafd3d8
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

@cenit
Copy link
Contributor Author

cenit commented Nov 29, 2021

@BillyONeal any news here? also the PR on which this is depending is waiting for a very long time now (and is ready too...)

@BillyONeal
Copy link
Member

how much influence other ms teams might have in deciding sprints in ado agile development ;) your use case is pretty much standard, if it does not work very well already it might deserve a call, maybe you get heard more than outsiders :)

Well they have an answer to make it reliable: don't cheap out on your VMs. We have chosen to accept some level of random failures in exchange for paying about half and this is what happens there. :)

@BillyONeal any news here?

This PR was still marked as depending on the other one so we haven't been looking.

also the PR on which this is depending is waiting for a very long time now (and is ready too...)

Yeah it looks like upstream has been notified there. After that lands do you have anything else you need to do before this one is ready?

# Conflicts:
#	ports/gtk/portfile.cmake
#	versions/g-/gtk.json
@BillyONeal BillyONeal removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Nov 29, 2021
@BillyONeal
Copy link
Member

Since it looks like this PR had the contents of the other one I resolved conflicts in favor of #20654 .

Please confirm that you don't want to do anything else?

@cenit
Copy link
Contributor Author

cenit commented Nov 29, 2021

confirmed, pr is ready since a long time ago

yesterday i moved the control to manifest just to trigger a rebuild on osx by myself (it failed for unknown reasons after merging from master)

@JackBoosY JackBoosY self-assigned this Nov 30, 2021
@JackBoosY JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Dec 1, 2021
@BillyONeal BillyONeal merged commit f6601ee into microsoft:master Dec 2, 2021
@BillyONeal
Copy link
Member

Thanks for the updates!

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:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

install opencv2[cuda * * * ] fails with error: Unsupported gpu architecture 'compute_30' OpenCV 4.3.0 No HighGUI/GTK support on Linux

9 participants