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

Clean up wlroots build #23793

Closed
wants to merge 9 commits into from
Closed

Clean up wlroots build #23793

wants to merge 9 commits into from

Conversation

ericonr
Copy link
Member

@ericonr ericonr commented Jul 24, 2020 •
edited

Include all dependencies needed for building wlroots based applications into wlroots-devel. If they aren't included, meson complains about missing deps. Clean up templates accordingly.

I am only revbumping the packages that actually change, so wlroots and wf-config. The rest are unchanged, because it's only how the dependencies are pulled in that changes.

I guess @ifreund @ahesford @travankor

@ericonr
Copy link
Member Author

ericonr commented Jul 24, 2020

Also wayfire should be split into a devel package, but I will do that when it's updated.

ahesford
ahesford reviewed Jul 24, 2020
View reviewed changes
Copy link
Member

@ahesford ahesford left a comment

Choose a reason for hiding this comment

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

I haven't looked too closely at all of the dependencies, but I like the simplicity this brings to dependent templates.

srcpkgs/wlroots/template Outdated
depends="MesaLib-devel elogind-devel eudev-libudev-devel libcap-devel
libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel
wayland-protocols wlroots-${version}_${revision}"
depends="${sourcepkg}-${version}_${revision} ${_devel_depends}"
Copy link
Member

Choose a reason for hiding this comment

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

Better to use >= rather than a specific version.

Copy link
Member Author

Choose a reason for hiding this comment

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

I was wondering, thanks.

ifreund
ifreund reviewed Jul 24, 2020
View reviewed changes
Copy link
Contributor

@ifreund ifreund left a comment

Choose a reason for hiding this comment

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

This looks OK to me. It is possible to depend on wlroots without needing several of the libraries now depended on by wlroots-devel but this does clean up the templates nicely and I don't have a problem with a few extra devel packages being pulled in.

@ericonr
Copy link
Member Author

ericonr commented Jul 24, 2020

@ifreund the packages I added were all packages the build system was complaining about, because they weren't found during the configuration step and were a requirement for wlroots, not its dependants, but all dependants had them.

travankor
travankor reviewed Jul 27, 2020
View reviewed changes
srcpkgs/wlroots/template Outdated Show resolved Hide resolved
@travankor
Copy link
Contributor

Aren't all the xcb dependencies only required for Xwayland? Maybe we can make Xwayland a build option?

@ifreund
Copy link
Contributor

ifreund commented Jul 27, 2020

Aren't all the xcb dependencies only required for Xwayland? Maybe we can make Xwayland a build option?

There are two separate parts here, one is Xwayland and the other is the X11 backend allowing nesting a wlroots-based compositor in an X11 session. We could make these both optional, but I'm not sure it's really worth it. We would then need parallel build options for sway, cage, hikari, and wayfire.

@ericonr
Copy link
Member Author

ericonr commented Jul 27, 2020

Wayfire should be released in a few days, might as well wait for it.

@ericonr
Copy link
Member Author

ericonr commented Jul 27, 2020

@yjp20 are you still using Wayfire?

@ahesford
Copy link
Member

Please roll the latest hikari into this, which is 2.1.1 for now.

@ericonr
Copy link
Member Author

ericonr commented Aug 2, 2020

TODO: add suid option to wayfire.

@ericonr ericonr mentioned this pull request Aug 3, 2020
Closed
@ericonr
wlroots: provide all dependencies in wlroots-devel.
88def46 
These dependencies are all required when building applications that use
wlroots, so it doesn't make sense to include them individually into each
application's template.

Also remove libcap, which was dropped by upstream.
@ericonr
Copy link
Member Author

ericonr commented Aug 4, 2020

Temporary git versions for wcm and wayfire-plugins-extra, waiting on their releases.

ahesford
ahesford requested changes Aug 4, 2020
View reviewed changes
Copy link
Member

@ahesford ahesford left a comment

Choose a reason for hiding this comment

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

You might also drop desc_option_elogind from the sway template, that way all templates will just default to the common description.

srcpkgs/cage/template Outdated Show resolved Hide resolved
srcpkgs/wayfire/template Outdated Show resolved Hide resolved
srcpkgs/wayfire-plugins-extra/template Outdated Show resolved Hide resolved
@ericonr
sway: clean up makedepends.
f0bb47d 
Drop elogind description.
@ericonr
hikari: update to 2.1.1, clean up makedepends.
c852600 
Removed the dependencies provided by wlroots, removed libevdev-devel,
which isn't required, and put wayland-devel unconditionally in
hostmakedepends, to follow the pattern of the other templates.
@ericonr
cage: clean makedeps, add xwayland,elogind options
98638f4 
Partly by @travankor
closes void-linux#20755
@ericonr ericonr force-pushed the wlroots branch 4 times, most recently from c896acb to 7080d66 Compare August 4, 2020 17:51
@ericonr
wayfire: update to 0.5.0, split devel, adopt.
223cb4d 
- Also cleaned up make depends.
- Added elogind build option.
- Added wf-utils subproject
@ericonr
wf-shell: update to 0.5.0, clean up makedepends.
ce11aaf
@ericonr
Copy link
Member Author

ericonr commented Aug 4, 2020

@ahesford pending CI, this is good to go.

@ericonr ericonr mentioned this pull request Aug 4, 2020
Closed
@ahesford ahesford closed this in 976ef77 Aug 4, 2020
@ericonr ericonr deleted the wlroots branch August 4, 2020 21:07
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 12, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ifreund ifreund ifreund left review comments

@travankor travankor travankor left review comments

@ahesford ahesford ahesford requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ericonr @travankor @ifreund @ahesford