> On Tue, Jan 20, 2026 at 2:38 AM Alan Coopersmith
> <[email protected]> wrote:
> > […]
> >
> > If so, is this the right set of commits to include & exclude? Now is the
> > time to rewrite history on this branch before it becomes official and
> > people start relying on it, if there's more changes we should drop, or
> > changes I dropped that people think should stay.
Found another commit [4] that needs fixing in the existing history:
commit ce6704521 - Use logical_ prefix for logical coordinate system values
That translates as commit b98cf3843 [5] in your "main" branch.
The build fails with debug enabled because the debug message uses the
width/height thare just been renamed but the commit:
../hw/xwayland/xwayland-window.c: In function
‘xwl_window_enable_viewport_for_output’:
../hw/xwayland/xwayland-window.c:451:26: error: ‘struct xwl_output’
has no member named ‘width’
451 | xwl_output->width, xwl_output->height);
| ^~
../hw/xwayland/xwayland-window.c:451:45: error: ‘struct xwl_output’
has no member named ‘height’
451 | xwl_output->width, xwl_output->height);
| ^~
A patch to apply to the commit is attached to this email.
HTH
Olivier
[4] https://gitlab.freedesktop.org/xorg/xserver/-/commit/ce6704521
[5] https://gitlab.freedesktop.org/alanc/xserver/-/commit/b98cf3843
diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index 478e6fb02..e9765c7b9 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -448,7 +448,7 @@ xwl_window_enable_viewport_for_output(struct xwl_window *xwl_window,
if (!xwl_window_has_viewport_enabled(xwl_window)) {
DebugF("XWAYLAND: enabling viewport %dx%d -> %dx%d\n",
emulated_mode->width, emulated_mode->height,
- xwl_output->width, xwl_output->height);
+ xwl_output->logical_w, xwl_output->logical_h);
xwl_window->viewport = wp_viewporter_get_viewport(xwl_window->xwl_screen->viewporter,
xwl_window->surface);
}
