Created attachment 250120 [details] v0 (RC1) I only dogfood -devel, so this is mainly to align commits (split, messages, references). HiDPI is gone but can be restored later. Alternatively, wait for https://aur.archlinux.org/packages/xorg-xwayland-hidpi-xprop (different implementation) then rebase and push to a GitHub mirror (for PATCHFILES).
Created attachment 250121 [details] v0 (RC1) Also cleanup in -devel.
You can land the xorgproto part. For xwayland please wait for 24.1.0 to be released (should be release mid-May). If you want you can land the HiDPI part, I have no strong feeling about this but I prefer to keep features in sync with -devel.
HiDPI can be restored in -devel port if someone (or AUR) helps. Otherwise, the removal is a workaround for the following: ===> Patching for xwayland-24.0.99.901,1 ===> Applying distribution patches for xwayland-24.0.99.901,1 3 out of 4 hunks failed--saving rejects to hw/xwayland/xwayland-cursor.c.rej 3 out of 11 hunks failed--saving rejects to hw/xwayland/xwayland-input.c.rej 1 out of 7 hunks failed--saving rejects to hw/xwayland/xwayland-output.c.rej 1 out of 2 hunks failed--saving rejects to hw/xwayland/xwayland-output.h.rej ===> FAILED Applying distribution patch 707c37b7ab9e.patch with -p1 *** Error code 1 In 2024 (compared to 2020) far more stuff supports Wayland, so HiDPI in Xwayland is less important. For example, x11-wm/niri doesn't support rootless Xwayland, nudging users to rootful Xwayland (HiDPI is upstream) or finding Wayland-ready alternatives.
Besides Hyprland zero scaling is also supported by Mir and KWin. https://github.com/canonical/mir/pull/1896 https://invent.kde.org/plasma/kwin/-/merge_requests/2288
Created attachment 250335 [details] v0.1 (RC2) Unbreak swayfx, rebase and update. @manu, do you plan to test *before* the actual release? once 24.1.0 is released should I wait for you or is the implicit conditional approval from comment 2 applies?
(In reply to Jan Beich from comment #5) You can commit the released version. But can you please first update to 23.2.7 and MFH this ?
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=c947234280dae5d5b59454e0ce5c79bcdfe970cb commit c947234280dae5d5b59454e0ce5c79bcdfe970cb Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-05-15 06:23:35 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-05-15 22:28:51 +0000 x11-servers/xwayland: Update to 23.2.7 Changes: https://lists.x.org/archives/xorg-announce/2024-May/003514.html PR: 278495 Approved by: manu x11-servers/xwayland/Makefile | 2 +- x11-servers/xwayland/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe76e5da0d00c438aa5804212414425e4f0b8a60 commit fe76e5da0d00c438aa5804212414425e4f0b8a60 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-04-09 15:18:03 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-05-15 22:28:54 +0000 x11-servers/xwayland: drop HiDPI patches to unblock updates - Rootful HiDPI[1] introduces non-trivial conflicts to rootless HiDPI - AUR[2] tracks Xwayland releases, so may not help with rebases - Sway should probably adopt zero scaling from Mir/KWin/Hyprland - Xwayland usage has reduced since 2020 [1] https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1197 [2] https://aur.archlinux.org/packages/xorg-xwayland-hidpi-xprop This reverts commit 466f3a1eabfe2acf82e64e2c388759a5b0e4276d. This reverts commit 843e295cf33f9d2652c7b2e0d4ea0b2bc14e9c59. This reverts commit dce99729d741f14bc81d941d29b70a8a7147298c. PR: 278495 Approved by: manu UPDATING | 14 -------------- x11-servers/xwayland/Makefile | 6 +----- x11-servers/xwayland/distinfo | 6 ------ x11-toolkits/wlroots/Makefile | 4 +--- x11-toolkits/wlroots/distinfo | 4 ---- x11-toolkits/wlroots015/Makefile | 5 +---- x11-toolkits/wlroots015/distinfo | 4 ---- x11-toolkits/wlroots016/Makefile | 5 +---- x11-toolkits/wlroots016/distinfo | 4 ---- x11-wm/sway/Makefile | 5 +---- x11-wm/sway/distinfo | 4 ---- x11-wm/sway/pkg-message | 4 ---- x11-wm/swayfx/Makefile | 5 +---- x11-wm/swayfx/distinfo | 4 ---- x11-wm/swayfx/pkg-message | 4 ---- x11-wm/wayfire/Makefile | 4 +--- x11-wm/wayfire/distinfo | 2 -- x11-wm/wayfire/pkg-message | 12 ------------ 18 files changed, 7 insertions(+), 89 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3f142350f8f9f4a929023eca10055be1cd2cd08 commit c3f142350f8f9f4a929023eca10055be1cd2cd08 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-03-26 07:16:32 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-05-15 22:28:52 +0000 x11/xorgproto: update to 2024.1 Changes: https://lists.x.org/archives/xorg-announce/2024-March/003495.html PR: 278495 Approved by: manu x11-servers/xwayland-devel/Makefile | 7 ------- x11-servers/xwayland-devel/distinfo | 2 -- x11/xorgproto/Makefile | 2 +- x11/xorgproto/distinfo | 6 +++--- 4 files changed, 4 insertions(+), 13 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=14ac02a9568e02cdc4fb45d0debe080034e62c23 commit 14ac02a9568e02cdc4fb45d0debe080034e62c23 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-05-15 06:21:39 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-05-15 22:37:21 +0000 x11-servers/xwayland: update to 24.1.0 Explicit GPU synchronization cannot be used on FreeBSD yet: - https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4262 - https://gitlab.freedesktop.org/wlroots/wlroots/-/issues/3843 - https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1520 - https://github.com/freebsd/drm-kmod/issues/278 - nvidia-drm-kmod adaptation for nvidia-driver >= 555 (EGL) and 560 (Vulkan) Changes: https://lists.x.org/archives/xorg-announce/2024-April/003510.html Changes: https://lists.x.org/archives/xorg-announce/2024-May/003513.html Changes: https://lists.x.org/archives/xorg-announce/2024-May/003515.html PR: 278495 Approved by: manu x11-servers/xwayland/Makefile | 9 ++------- x11-servers/xwayland/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 10 deletions(-)
A commit in branch 2024Q2 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=e8878d73df73094fa6fd3ca078b1f6b1bac6a55d commit e8878d73df73094fa6fd3ca078b1f6b1bac6a55d Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-05-15 06:23:35 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-05-15 22:38:28 +0000 x11-servers/xwayland: Update to 23.2.7 Changes: https://lists.x.org/archives/xorg-announce/2024-May/003514.html PR: 278495 Approved by: manu (cherry picked from commit c947234280dae5d5b59454e0ce5c79bcdfe970cb) x11-servers/xwayland/Makefile | 2 +- x11-servers/xwayland/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
(In reply to Jan Beich from comment #3) Found (via AUR) a rebased version at https://github.com/archlinuxcn/repo/blob/master/archlinuxcn/xorg-xwayland-hidpi-git/xwlScaling.diff