Skip to content

[openmvg] Fix for building with eigen 3.4.0.#20056

Merged
BillyONeal merged 5 commits intomicrosoft:masterfrom
aluaces:openmvg_eigen_3.4.0
Sep 24, 2021
Merged

[openmvg] Fix for building with eigen 3.4.0.#20056
BillyONeal merged 5 commits intomicrosoft:masterfrom
aluaces:openmvg_eigen_3.4.0

Conversation

@aluaces
Copy link
Copy Markdown
Contributor

@aluaces aluaces commented Sep 8, 2021

This solves the building error when upgrading eigen in #19665

Copy link
Copy Markdown

@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 openmvg but no changes to version or port version.
-- Version: 1.6#2
-- Old SHA: f62103b28735c9e72b9a866e6530c52629e77295
-- New SHA: 1ea71fe13af7500b8593c5bcff43cd74d1d8ce0c
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

Copy link
Copy Markdown

@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 bcf551b980380fe7f84fa302ad7ef3c184f9bf4f -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 31586ba..497bd89 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4734,7 +4734,7 @@
     },
     "openmvg": {
       "baseline": "1.6",
-      "port-version": 2
+      "port-version": 3
     },
     "openmvs": {
       "baseline": "1.1",
diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json
index bced436..d450c86 100644
--- a/versions/o-/openmvg.json
+++ b/versions/o-/openmvg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "219414d49228ae50fcd76d08d153f326a119849e",
+      "version-string": "1.6",
+      "port-version": 3
+    },
     {
       "git-tree": "f62103b28735c9e72b9a866e6530c52629e77295",
       "version-string": "1.6",

@NancyLi1013 NancyLi1013 added category:port-bug The issue is with a library, which is something the port should already support requires:author-response labels Sep 9, 2021
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Copy link
Copy Markdown

@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 bcf551b980380fe7f84fa302ad7ef3c184f9bf4f -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index e2da5b2..aac28e4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4734,7 +4734,7 @@
     },
     "openmvg": {
       "baseline": "1.6",
-      "port-version": 2
+      "port-version": 3
     },
     "openmvs": {
       "baseline": "1.1",
diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json
index bced436..67945f7 100644
--- a/versions/o-/openmvg.json
+++ b/versions/o-/openmvg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f171436873c79834dd6616216da68a61af4dbebe",
+      "version": "1.6",
+      "port-version": 3
+    },
     {
       "git-tree": "f62103b28735c9e72b9a866e6530c52629e77295",
       "version-string": "1.6",

Copy link
Copy Markdown

@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 bcf551b980380fe7f84fa302ad7ef3c184f9bf4f -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index e2da5b2..aac28e4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4734,7 +4734,7 @@
     },
     "openmvg": {
       "baseline": "1.6",
-      "port-version": 2
+      "port-version": 3
     },
     "openmvs": {
       "baseline": "1.1",
diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json
index bced436..1731c06 100644
--- a/versions/o-/openmvg.json
+++ b/versions/o-/openmvg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f3087d8d002d7f226e77427ce363e2b20371485",
+      "version": "1.6",
+      "port-version": 3
+    },
     {
       "git-tree": "f62103b28735c9e72b9a866e6530c52629e77295",
       "version-string": "1.6",

@NancyLi1013
Copy link
Copy Markdown
Contributor

Could you please run vcpkg x-add-version openmvg to update version files? @aluaces

Also have you tested these features in this PR?

@aluaces
Copy link
Copy Markdown
Contributor Author

aluaces commented Sep 13, 2021

Could you please run vcpkg x-add-version openmvg to update version files? @aluaces

Done

Also have you tested these features in this PR?

I'm not an user of the library, but the changes have been reviewed and approved by upstream, so I'm confident that they are right, being almost trivial.

@NancyLi1013
Copy link
Copy Markdown
Contributor

Also have you tested these features in this PR?

I'm not an user of the library, but the changes have been reviewed and approved by upstream, so I'm confident that they are right, being almost trivial.

Thanks for your information. I mean if you have tested these features opencv ,software with openmvg. Namely build openmvg[opencv,software] on x86-windows, x64-windows-static and x64-linux.

Since our CI test machine will only test the default features. Other features need to be tested manually.

@aluaces
Copy link
Copy Markdown
Contributor Author

aluaces commented Sep 14, 2021

Thanks for your information. I mean if you have tested these features opencv ,software with openmvg. Namely build openmvg[opencv,software] on x86-windows, x64-windows-static and x64-linux.

Since our CI test machine will only test the default features. Other features need to be tested manually.

Oh, now I understand, thanks

  • x86-windows is working.
  • x64-windows-static fails with OpenMVG software currently cannot be built with static CRT linking. Please open an issue if you require this feature.
  • x64-linux fails when building fontconfig:
    /usr/bin/ld: cannot find -lfreetyped
    /usr/bin/ld: cannot find -lbz2d
    /usr/bin/ld: cannot find -lpng16d

Edit: sorry, I meant fontconfig, not freetype.

@NancyLi1013
Copy link
Copy Markdown
Contributor

Thanks for your feedback.

For the status on x64-windows-static, it is expected. So we can leave it alone.

For the status on x64-linux, I will check the current status on master branch to confirm if it is the new problem caused by this PR.

@aluaces
Copy link
Copy Markdown
Contributor Author

aluaces commented Sep 17, 2021

Well, I did a fresh build of fontconfig and it's working fine. Unsurprisingly, since eigen shouldn't be one of its dependencies.

@NancyLi1013
Copy link
Copy Markdown
Contributor

Well, I did a fresh build of fontconfig and it's working fine. Unsurprisingly, since eigen shouldn't be one of its dependencies.

So there is no any problems for the features on Linux, right?

@aluaces
Copy link
Copy Markdown
Contributor Author

aluaces commented Sep 21, 2021

Well, I cannot be completely sure, since it is stopping now at qt5-base, but I get the same error in master, so I think it has nothing to do with this patch.

@NancyLi1013
Copy link
Copy Markdown
Contributor

LGTM now, thanks for your fixing. @aluaces

@NancyLi1013 NancyLi1013 added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed requires:all-feature-testing labels Sep 23, 2021
@BillyONeal BillyONeal merged commit 5b61ee0 into microsoft:master Sep 24, 2021
@BillyONeal
Copy link
Copy Markdown
Member

Thanks for the fix!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-bug The issue is with a library, which is something the port should already support 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.

3 participants