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

[qtbase] support for android #27421

Merged
merged 18 commits into from
Nov 2, 2022
Merged

[qtbase] support for android #27421

merged 18 commits into from
Nov 2, 2022

Conversation

m-kuhn
Copy link
Contributor

@m-kuhn m-kuhn commented Oct 23, 2022

Describe the pull request

  • What does your PR fix?

    Adds support for android to qtbase.
    This is exploratory.

  • Does your PR follow the maintainer guide?

    Yes

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 qtbase have changed but the version was not updated
version: 6.3.2#1
old SHA: 02656542bbdef8469f5a461b1523c4111f0841b3
new SHA: ebc3c734131f849fd82b98976476d25f1d7ac5c3
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

@m-kuhn
Copy link
Contributor Author

m-kuhn commented Oct 23, 2022

Currently fails with

ERROR: The OpenGL functionality tests failed! You might need to modify the OpenGL package search path by setting the OpenGL_DIR CMake variable to the OpenGL library's installation directory.

Might need something based on -DFEATURE_opengles2=ON

@Neumann-A
Copy link
Contributor

How does OpenGL work on Android?

@m-kuhn
Copy link
Contributor Author

m-kuhn commented Oct 24, 2022

How does OpenGL work on Android?

Apparently it needs GLES and EGL

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 qtbase have changed but the version was not updated
version: 6.3.2#1
old SHA: 02656542bbdef8469f5a461b1523c4111f0841b3
new SHA: 53aa4fb0e38f07a64dd49a32e91c1056e12deb20
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

@MonicaLiu0311 MonicaLiu0311 added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Oct 24, 2022
@MonicaLiu0311
Copy link
Contributor

Please refer to the above comments to modify, and execute the following commands to update the version.

Error: While reading versions for port qtbase from file: C:\a\1\s\versions\q-\qtbase.json
       File declares version `6.3.2#1` with SHA: 02656542bbdef8469f5a461b1523c4111f0841b3
       But local port with the same version has a different SHA: 53aa4fb0e38f07a64dd49a32e91c1056e12deb20
       Please update the port's version fields and then run:

           vcpkg x-add-version qtbase

@m-kuhn
Copy link
Contributor Author

m-kuhn commented Oct 24, 2022

Hi @MonicaLiu0311 as soon as the content is ready for review I will remove the draft status and update the version db.

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 934a99dc13cabb330824ae1a5ab4a53a9acc5a49 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index e438d4d..97f321c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6210,7 +6210,7 @@
     },
     "qtbase": {
       "baseline": "6.3.2",
-      "port-version": 1
+      "port-version": 2
     },
     "qtcharts": {
       "baseline": "6.3.2",
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index 485b738..37bbf0c 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4e4cb7e313bfe162ad327407cc6757ceb7ed039f",
+      "version": "6.3.2",
+      "port-version": 2
+    },
     {
       "git-tree": "02656542bbdef8469f5a461b1523c4111f0841b3",
       "version": "6.3.2",

github-actions[bot]
github-actions bot previously approved these changes Oct 24, 2022
@m-kuhn m-kuhn marked this pull request as ready for review October 24, 2022 20:54
github-actions[bot]
github-actions bot previously approved these changes Oct 24, 2022
ports/qtbase/vcpkg.json Outdated Show resolved Hide resolved
github-actions[bot]
github-actions bot previously approved these changes Oct 24, 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.

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 qtbase have changed but the version was not updated
version: 6.3.2#2
old SHA: a73f5a5636e38062618122a2fdeb04ca3983e078
new SHA: 8ad3353bcbf1d136924320f36d8879e1acb0e3c3
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

github-actions[bot]
github-actions bot previously approved these changes Oct 27, 2022
github-actions[bot]
github-actions bot previously approved these changes Oct 27, 2022
MonicaLiu0311
MonicaLiu0311 previously approved these changes Oct 28, 2022
@MonicaLiu0311 MonicaLiu0311 added the info:reviewed Pull Request changes follow basic guidelines label Oct 28, 2022
BillyONeal
BillyONeal previously approved these changes Oct 28, 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.

I'm leaving this open despite info:reviewed status for now until it's clear @Neumann-A is happy as the resident Qt subject matter expert, but this looks reasonable in concept to me.

ports/qtbase/vcpkg.json Outdated Show resolved Hide resolved
@MonicaLiu0311 MonicaLiu0311 removed the info:reviewed Pull Request changes follow basic guidelines label Oct 28, 2022
github-actions[bot]
github-actions bot previously approved these changes Oct 28, 2022
@MonicaLiu0311 MonicaLiu0311 added the info:reviewed Pull Request changes follow basic guidelines label Nov 1, 2022
@BillyONeal BillyONeal merged commit 736fb33 into microsoft:master Nov 2, 2022
@BillyONeal
Copy link
Member

Thanks!

BillyONeal added a commit to BillyONeal/vcpkg that referenced this pull request Nov 2, 2022
BillyONeal added a commit that referenced this pull request Nov 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants