diff --git a/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.ActivityManager.service b/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.ActivityManager.service deleted file mode 100644 index 8da0941b59..0000000000 --- a/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.ActivityManager.service +++ /dev/null @@ -1,4 +0,0 @@ -#TODO: kactivitymanagerd daemon is not yet validated on Redox — D-Bus activation may fail until it is built and staged -[D-BUS Service] -Name=org.kde.ActivityManager -Exec=/usr/bin/kactivitymanagerd diff --git a/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.JobViewServer.service b/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.JobViewServer.service deleted file mode 100644 index 22962c941b..0000000000 --- a/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.JobViewServer.service +++ /dev/null @@ -1,4 +0,0 @@ -#TODO: kuiserver is not yet validated on Redox — D-Bus activation may fail until it is built and staged -[D-BUS Service] -Name=org.kde.JobViewServer -Exec=/usr/bin/kuiserver diff --git a/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.kded6.service b/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.kded6.service deleted file mode 100644 index e9d7f6b30e..0000000000 --- a/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.kded6.service +++ /dev/null @@ -1,4 +0,0 @@ -#TODO: kded6 daemon not yet built for Redox — D-Bus activation will fail until it exists -[D-BUS Service] -Name=org.kde.kded6 -Exec=/usr/bin/kded6 diff --git a/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.kglobalaccel.service b/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.kglobalaccel.service deleted file mode 100644 index 7cf0b8246d..0000000000 --- a/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.kglobalaccel.service +++ /dev/null @@ -1,4 +0,0 @@ -#TODO: kglobalaccel daemon not yet built for Redox — D-Bus activation will fail until it exists -[D-BUS Service] -Name=org.kde.kglobalaccel -Exec=/usr/bin/kglobalaccel diff --git a/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.ksmserver.service b/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.ksmserver.service deleted file mode 100644 index 892da610c0..0000000000 --- a/local/recipes/system/redbear-dbus-services/files/session-services/org.kde.ksmserver.service +++ /dev/null @@ -1,4 +0,0 @@ -#TODO: ksmserver is not yet validated on Redox — D-Bus activation may fail until it is built and staged -[D-BUS Service] -Name=org.kde.ksmserver -Exec=/usr/bin/ksmserver diff --git a/local/recipes/wayland/xwayland/recipe.toml b/local/recipes/wayland/xwayland/recipe.toml new file mode 100644 index 0000000000..895f9f761b --- /dev/null +++ b/local/recipes/wayland/xwayland/recipe.toml @@ -0,0 +1,42 @@ +[package] +name = "xwayland" +version = "24.1.8" + +#TODO wayland-client, fix linux/input, wayland-scanner shim +[source] +tar = "https://www.x.org/releases/individual/xserver/xwayland-24.1.8.tar.xz" +patches = [ + "redox.patch" +] +[build] +template = "meson" +dependencies = [ + "libpthread-stubs", + "libepoxy", + "libxkbfile", + "libxfont2", + "libffi", + "libpng", + "pixman", + "x11proto", + "xtrans", + "libxau", + "libx11", + "libxcb", + "openssl1", + "freetype2", + "libwayland", + "libfontenc", + "wayland-protocols", + "zlib", + "libxcvt", + "libxdmcp", + "libxshmfence", +] +mesonflags = [ + "-Ddrm=false", + "-Dglamor=false", + "-Dglx=false", + "-Dsecure-rpc=false", + "-Dmitshm=false", +] diff --git a/recipes/wip/wayland/xwayland/recipe.toml b/recipes/wip/wayland/xwayland/recipe.toml index 895f9f761b..41031b06d9 100644 --- a/recipes/wip/wayland/xwayland/recipe.toml +++ b/recipes/wip/wayland/xwayland/recipe.toml @@ -2,7 +2,24 @@ name = "xwayland" version = "24.1.8" -#TODO wayland-client, fix linux/input, wayland-scanner shim +#TODO: complete runtime validation. The recipe builds with the +#current patch set, but the following remain open: +# 1. Run a live X client under Xwayland on the Red Bear Wayland +# compositor; verify that the X11 forwarding creates and surfaces +# windows correctly via wl_shm + the X11 window protocol. +# 2. Verify XInput2 input forwarding (pointer + keyboard) through +# the libinput path on Red Bear. +# 3. Validate Xrender + Xshm extensions against the Mesa-backed +# xshmfence path (we already include libxshmfence in deps). +# 4. Capture an Xwayland-launched X11 client screenshot from +# inside the Red Bear Wayland session. +# 5. The current recipe has -Ddrm=false, -Dglamor=false, -Dglx=false +# which means it's a pure software rasterizer. A real +# acceleration path needs the upstream glamor/GLX +# integration and a working libdrm-amdgpu-or-intel userland +# driver. For now, Xwayland is a CPU-rendered X server; that +# is sufficient for headless validation but not for a full +# KDE-on-X11 fallback. [source] tar = "https://www.x.org/releases/individual/xserver/xwayland-24.1.8.tar.xz" patches = [