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.

Sign up for GitHub

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] enable egl for android #35961

Closed
wants to merge 5 commits into from
Closed

[qtbase] enable egl for android #35961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96c2a3f
[qtbase] enable egl for android
m-kuhn Dec 23, 2023
2d0ffdc
Expect qtbase:android to fail
m-kuhn Jan 1, 2024
a5552a0
Missing system libraries to test qtwayland
m-kuhn Jan 2, 2024
ec3696b
Adjust test baseline
m-kuhn Jan 3, 2024
661a541
Add missing dependency
m-kuhn Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/qtbase/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "qtbase",
"version": "6.6.1",
"port-version": 3,
"port-version": 4,
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down Expand Up @@ -157,7 +157,7 @@
},
"egl": {
"description": "EGL",
"supports": "linux",
"supports": "linux | android",
"dependencies": [
"egl"
]
Expand Down
3 changes: 3 additions & 0 deletions scripts/azure-pipelines/android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ ENV APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \
libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev \
libxcb-cursor-dev libxkbcommon-x11-dev"

# qtwayland
ENV APT_PACKAGES="$APT_PACKAGES libwayland-dev"

## PowerShell
ENV APT_PACKAGES="$APT_PACKAGES powershell"

Expand Down
6 changes: 6 additions & 0 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,9 +933,15 @@ qt5-canvas3d:x64-windows=skip
qt5-canvas3d:x64-windows-static=skip
qt5-canvas3d:x64-windows-static-md=skip
qt5-canvas3d:x86-windows=skip
# Missing Android SDK in Docker image, see https://github.com/microsoft/vcpkg/pull/35845
qtbase:arm64-android=fail
qtbase:arm-neon-android=fail
qtbase:x64-android=fail
# Missing system libraries
qtwayland:x64-osx=fail
qtwayland:arm64-osx=fail
# Missing system libraries when pulled in as dependency for android
qtwayland:x64-linux=skip
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be fixed by https://github.com/microsoft/vcpkg/pull/35961/files#diff-783e7bf9703fa77a2652b514ee607d8e40aafdd4f25f7e4e663de8b224f43e62R36 but I cannot prove it in this PR, as the docker image in use is a prebuilt one

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
qtwayland:x64-linux=skip

# Missing prerequisites for CI success
# Fail due to outdated protoc headers.
# D:\buildtrees\qt5-webengine\x64-windows-dbg\src\core\debug\gen\net/third_party/quiche/src/quic/core/proto/cached_network_parameters.pb.h(17):
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7110,7 +7110,7 @@
},
"qtbase": {
"baseline": "6.6.1",
"port-version": 3
"port-version": 4
},
"qtcharts": {
"baseline": "6.6.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qtbase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c5339512fed40e50903ff09dcb0079799274b3b7",
"version": "6.6.1",
"port-version": 4
},
{
"git-tree": "b85d2c16c027edb173f51037d9c5a3e05746efa0",
"version": "6.6.1",
Expand Down