forked from pool/xorg-x11-server
Accepting request 900639 from X11:XOrg
OBS-URL: https://build.opensuse.org/request/show/900639 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=393
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
f6f8f0cc16
@ -1,82 +0,0 @@
|
||||
From 7ad1d0d384085fb480e00547c22a3e8a14b514ea Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garnacho <carlosg@gnome.org>
|
||||
Date: Sat, 20 Jul 2019 00:16:43 +0200
|
||||
Subject: [PATCH] xwayland: Allow passing a fd for set up clients
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This FD also triggers the "wait for WM_S0" paths, so that the
|
||||
compositor may set up a "maintenance line" for Xwayland, for
|
||||
services that are essential to run before any client (eg. xrdb).
|
||||
Those services would use this FD, disguised as an extra display
|
||||
connection.
|
||||
|
||||
This -initfd can be seen as a generalization of -wm, a Wayland
|
||||
compositor may use -initfd to launch its WM and any other clients
|
||||
that should start up, or it may use -wm as a dedicated connection for
|
||||
the WM and optionally use -initfd for the misc. startup clients.
|
||||
|
||||
If either of -wm or -initfd is passed, Xwayland will expect a selection
|
||||
notification on WM_S0 before incorporating the FDs in -listen to the
|
||||
poll list.
|
||||
|
||||
Also, correct a minor typo in the listenfd argument output,
|
||||
give → given.
|
||||
|
||||
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
|
||||
---
|
||||
hw/xwayland/xwayland.c | 19 +++++++++++++++----
|
||||
1 file changed, 15 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
|
||||
index 111d4fafd..3983a114c 100644
|
||||
--- orig-xorg-server-1.20.5/hw/xwayland/xwayland.c 2019-05-30 20:27:34.000000000 +0200
|
||||
+++ xorg-server-1.20.5/hw/xwayland/xwayland.c 2019-09-16 17:26:47.771777034 +0200
|
||||
@@ -95,7 +95,8 @@
|
||||
{
|
||||
ErrorF("-rootless run rootless, requires wm support\n");
|
||||
ErrorF("-wm fd create X client for wm on given fd\n");
|
||||
- ErrorF("-listen fd add give fd as a listen socket\n");
|
||||
+ ErrorF("-initfd fd add given fd as a listen socket for initialization clients\n");
|
||||
+ ErrorF("-listenfd fd add given fd as a listen socket\n");
|
||||
ErrorF("-eglstream use eglstream backend for nvidia GPUs\n");
|
||||
}
|
||||
|
||||
+static int init_fd = -1;
|
||||
static int wm_fd = -1;
|
||||
static int listen_fds[5] = { -1, -1, -1, -1, -1 };
|
||||
static int listen_fd_count = 0;
|
||||
@@ -148,6 +150,11 @@ ddxProcessArgument(int argc, char *argv[], int i)
|
||||
wm_fd = atoi(argv[i + 1]);
|
||||
return 2;
|
||||
}
|
||||
+ else if (strcmp(argv[i], "-initfd") == 0) {
|
||||
+ CHECK_FOR_REQUIRED_ARGUMENTS(1);
|
||||
+ init_fd = atoi(argv[i + 1]);
|
||||
+ return 2;
|
||||
+ }
|
||||
else if (strcmp(argv[i], "-shm") == 0) {
|
||||
return 1;
|
||||
}
|
||||
@@ -1287,10 +1294,14 @@ InitOutput(ScreenInfo * screen_info, int argc, char **argv)
|
||||
|
||||
LocalAccessScopeUser();
|
||||
|
||||
- if (wm_fd >= 0) {
|
||||
- TimerSet(NULL, 0, 1, add_client_fd, NULL);
|
||||
+ if (wm_fd >= 0 || init_fd >= 0) {
|
||||
+ if (wm_fd >= 0)
|
||||
+ TimerSet(NULL, 0, 1, add_client_fd, NULL);
|
||||
+ if (init_fd >= 0)
|
||||
+ ListenOnOpenFD(init_fd, FALSE);
|
||||
AddCallback(&SelectionCallback, wm_selection_callback, NULL);
|
||||
- } else if (listen_fd_count > 0) {
|
||||
+ }
|
||||
+ else if (listen_fd_count > 0) {
|
||||
listen_on_fds();
|
||||
}
|
||||
}
|
||||
--
|
||||
2.22.0
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 17 11:43:48 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Drop U_xwayland-Allow-passing-a-fd.patch: We build xwayland in a
|
||||
separate package now, so no need to keep this patch here.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 16 07:56:30 UTC 2021 - Ismail Dönmez <ismail@i10z.com>
|
||||
|
||||
- Fix typo in %post: xbb.conf -> xkb.conf
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 11 11:03:18 UTC 2021 - Patrik Jakobsson <patrik.jakobsson@suse.com>
|
||||
|
||||
|
||||
@ -245,8 +245,6 @@ Patch1502: U_dix-window-Use-ConfigureWindow-instead-of-MoveWindow.patch
|
||||
|
||||
Patch1503: u_xfree86-Do-not-claim-pci-slots-if-fb-slot-is-already.patch
|
||||
|
||||
Patch1505: U_xwayland-Allow-passing-a-fd.patch
|
||||
|
||||
Patch1600: U_glamor_egl-Reject-OpenGL-2.1-early-on.patch
|
||||
|
||||
Patch1801: U_Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
|
||||
@ -401,9 +399,6 @@ sh %{SOURCE92} --verify . %{SOURCE91}
|
||||
%patch1401 -p1
|
||||
%patch1502 -p1
|
||||
%patch1503 -p1
|
||||
%if 0%{?have_wayland} == 1
|
||||
%patch1505 -p1
|
||||
%endif
|
||||
%patch1600 -p1
|
||||
%patch1801 -p1
|
||||
%patch1900 -p1
|
||||
@ -544,7 +539,7 @@ xargs cp --parents --target-directory=%{buildroot}/usr/src/xserver < source-file
|
||||
rm -f %{buildroot}/usr/src/xserver/config/fdi2iclass.py
|
||||
|
||||
%post
|
||||
%tmpfiles_create xbb.conf
|
||||
%tmpfiles_create xkb.conf
|
||||
%ifnarch s390 s390x
|
||||
%{fillup_only -an displaymanager}
|
||||
# Move SaX2 generated xorg.conf file to xorg.conf.sle11
|
||||
|
||||
Loading…
Reference in New Issue
Block a user