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

Jump to bottom

Add Wayland support #6458

Merged
merged 2 commits into from
Dec 8, 2023
Merged

Add Wayland support #6458

merged 2 commits into from
Dec 8, 2023

Conversation

Etaash-mathamsetty
Copy link
Contributor

@Etaash-mathamsetty Etaash-mathamsetty commented Dec 7, 2023 •
edited
Loading

Description
Adds wayland support into the builds of webots

Related Issues
This pull-request fixes issue #6424

Tasks
Add the list of tasks of this PR.

  • Test it

Documentation
Not sure what documentation I should add

Screenshots
image

Additional context
the webots-qt tarball needs to be updated with wayland support

@Etaash-mathamsetty Etaash-mathamsetty requested a review from a team as a code owner December 7, 2023 01:25
@Etaash-mathamsetty
Copy link
Contributor Author

is it possible for me to have the CI build it and I download the build?

@Etaash-mathamsetty
Copy link
Contributor Author

Etaash-mathamsetty commented Dec 7, 2023 •
edited
Loading

ok I built it myself, turns out it was pretty easy. qt6 wayland libraries are missing from the original qt tarball, so time to fix that I guess

@Etaash-mathamsetty
Copy link
Contributor Author

Etaash-mathamsetty commented Dec 7, 2023 •
edited
Loading

ok I will fix up this PR now that I know what is needed :)
edit: this is done, now everything should work when the tarball is updated

@Etaash-mathamsetty Etaash-mathamsetty force-pushed the wayland branch 2 times, most recently from 6cea922 to b298a10 Compare December 7, 2023 03:35
@omichel omichel added the enhancement Implementation of a minor feature label Dec 7, 2023
@omichel omichel added this to the R2023b-rev1 milestone Dec 7, 2023
omichel
omichel requested changes Dec 7, 2023
View reviewed changes
Copy link
Member

@omichel omichel left a comment

Choose a reason for hiding this comment

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

It seems to work for the tarball package. Did you also test with the deb package? I fear we still miss some lines in https://github.com/Etaash-mathamsetty/webots/blob/wayland/scripts/packaging/files_core.txt#L136 so that it works also with the deb package.

@omichel
Copy link
Member

omichel commented Dec 7, 2023

is it possible for me to have the CI build it and I download the build?

I sent you an invite to become a member of the webots committers group. Being a member, you should be able to create PRs on this repo (no need to fork anymore) and to set PR labels that will trigger CI jobs, including the build of test distributions.

@Etaash-mathamsetty
Copy link
Contributor Author

Etaash-mathamsetty commented Dec 7, 2023 •
edited
Loading

It seems to work for the tarball package. Did you also test with the deb package? I fear we still miss some lines in Etaash-mathamsetty/webots@wayland/scripts/packaging/files_core.txt#L136 so that it works also with the deb package.

it's not possible for me to test the .deb package, I use arch linux. I will fix that file now

omichel
omichel approved these changes Dec 8, 2023
View reviewed changes
Copy link
Member

@omichel omichel left a comment

Choose a reason for hiding this comment

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

Thank you. That looks good to me. Hopefully, someone will test the nightly build of the deb package and report any problem.

@omichel
Copy link
Member

omichel commented Dec 8, 2023

(feel free to Squash and merge)

@Etaash-mathamsetty Etaash-mathamsetty merged commit e7fd629 into cyberbotics:master Dec 8, 2023
20 checks passed
@Etaash-mathamsetty
Copy link
Contributor Author

was I supposed to merge it into develop? whoops

@omichel
Copy link
Member

omichel commented Dec 9, 2023

No, that's fine as it can be considered as a bug fix, maintenance fix or minor improvement. So, it's okay to target the master branch in these cases.

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

@omichel omichel omichel approved these changes

Assignees

@Etaash-mathamsetty Etaash-mathamsetty

Labels
enhancement Implementation of a minor feature
Milestone
R2023b-rev1
Development

Successfully merging this pull request may close these issues.
2 participants
@Etaash-mathamsetty @omichel