Page MenuHomeFreeBSD

x11-servers/xwayland: Sync options with xwayland-devel
ClosedPublic

Authored by manu on Apr 5 2024, 1:44 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Jun 15, 8:53 PM
Unknown Object (File)
May 19 2024, 11:40 AM
Unknown Object (File)
May 16 2024, 11:56 PM
Unknown Object (File)
May 16 2024, 11:55 PM
Unknown Object (File)
May 16 2024, 11:55 PM
Unknown Object (File)
May 16 2024, 11:54 PM
Unknown Object (File)
May 16 2024, 11:54 PM
Unknown Object (File)
May 16 2024, 11:54 PM
Subscribers
None

Details

Summary
  • Provide the option to compile with libdecor for client-side decoration
  • Provide the option to compile with libei for emulated input
  • Enable xdmcp
  • Use some meson default (ipv6, glamor, sha1 and xkb_dir)

Sponsored by: Beckhoff Automation GmbH & Co. KG

Test Plan

I wasn't able to test xdmcp as both lightdm and gdm seems to be broken for this
libdecor is likely useless under sway (and maybe other compositor) but it's switched off.
Unsure how to test properly libei

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

manu requested review of this revision.Apr 5 2024, 1:44 PM
manu created this revision.
manu edited the test plan for this revision. (Show Details)

libdecor is likely useless under sway

Try Wayfire which prefers CSD but also supports SSD. Without -decorate rootful Xwayland has no titlebar or close button. Unfortunately, Xwayland uses libdecor even for SSD.

Unsure how to test properly libei

Currently, GNOME-only. Plasma is already WIP while wlroots likely needs RemoteDesktop, InputCapture and ConnectToEIS.

libei + basu are small dependencies. It'd be nice to avoid Wayland roadblocks for Plasma (Wayland stalled?) and GNOME (planned).

x11-servers/xwayland/Makefile
32–33

Drop egl per poudriere warning in bug 278165.

36–37

DRI3 is enabled by default, similar to Glamor. Also, inconsistent with x11-servers/xorg-server which doesn't pass -Ddri3=true.

libei can be tested independently via make test or ei-demo-client + ei-demo-server. Xwayland built with EI=on can probably connect to ei-demo-server but I haven't figured out yet.

libdecor is likely useless under sway

Try Wayfire which prefers CSD but also supports SSD. Without -decorate rootful Xwayland has no titlebar or close button. Unfortunately, Xwayland uses libdecor even for SSD.

Indeed, with wayfire I can see the benefit to have it by default, it's done in my branch and will update the review later.

Unsure how to test properly libei

Currently, GNOME-only. Plasma is already WIP while wlroots likely needs RemoteDesktop, InputCapture and ConnectToEIS.

libei + basu are small dependencies. It'd be nice to avoid Wayland roadblocks for Plasma (Wayland stalled?) and GNOME (planned).

Enable CSD and EI by default
Remove EGL
Add xcsecurity

manu marked an inline comment as done.Apr 9 2024, 10:21 AM

Use dri3 default from meson.

x11-servers/xwayland/Makefile
36–37

Ah yes indeed, I've miss read the meson file. Will fix this

manu marked an inline comment as done.Apr 9 2024, 10:24 AM
jbeich added inline comments.
x11-servers/xwayland/Makefile
14

Inconsistent capitalization of server vs. client (ditto in pkg-descr). Can be partially blamed on upstream (subject line + picture). However, current COMMENT was likely taken (5f87249229d34) from -devel port which uses lowercase for both.

I'd prefer to use pkg-descr from -devel as well. It's the first paragraph from upstream homepage. Otherwise, verbose description mostly repeats COMMENT (tautological), has unclear origins (Google points at FreeBSD) and confuses users, who don't yet grasp Wayland (is not an application) or client/server model (is the same as X11). Besides, upstream is pedantic how Xwayland (is not "XWayland", also refers to binary name) is capitalized, similar to FreeBSD (is not "freebsd" nor "Freebsd").

22

Should be >=1.30 according to current meson.build. Or maybe switch to >0 to avoid churn.

This revision is now accepted and ready to land.Apr 9 2024, 1:38 PM
  • Server vs client
  • Use pkg-descr from -devel
  • >=1.30 for wayland-protocols
This revision now requires review to proceed.Apr 9 2024, 2:09 PM
This revision is now accepted and ready to land.Apr 9 2024, 2:24 PM