commit:     10fc6a6a7edcf1e7ff3d4db4fcbcbe18cec8f734
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  9 08:08:19 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul  9 08:08:43 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10fc6a6a

x11-base/xorg-server: backport deadlock fix

>From the 21.1 backport branch.

Closes: https://bugs.gentoo.org/909643
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/xorg-server-21.1.8-deadlock.patch        |  97 +++++++++++
 x11-base/xorg-server/xorg-server-21.1.8-r1.ebuild  | 194 +++++++++++++++++++++
 2 files changed, 291 insertions(+)

diff --git a/x11-base/xorg-server/files/xorg-server-21.1.8-deadlock.patch 
b/x11-base/xorg-server/files/xorg-server-21.1.8-deadlock.patch
new file mode 100644
index 000000000000..8da824119edf
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-21.1.8-deadlock.patch
@@ -0,0 +1,97 @@
+https://bugs.gentoo.org/909643
+https://gitlab.freedesktop.org/mesa/mesa/-/issues/116
+https://gitlab.freedesktop.org/mesa/mesa/-/issues/6685
+https://gitlab.freedesktop.org/xorg/xserver/-/commit/b98fc07d3442a289c6bef82df50dd0a2d01de71a
+
+From b98fc07d3442a289c6bef82df50dd0a2d01de71a Mon Sep 17 00:00:00 2001
+From: Adam Jackson <a...@redhat.com>
+Date: Thu, 2 Feb 2023 12:26:27 -0500
+Subject: [PATCH] present: Send a PresentConfigureNotify event for destroyed
+ windows
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This enables fixing a deadlock case on the client side, where the client
+ends up blocked waiting for a Present event that will never come because
+the window was destroyed. The new PresentWindowDestroyed flag allows the
+client to avoid blocking indefinitely.
+
+Signed-off-by: Adam Jackson <a...@redhat.com>
+See-also: https://gitlab.freedesktop.org/mesa/mesa/-/issues/116
+See-also: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6685
+Reviewed-by: Michel Dänzer <mdaen...@redhat.com>
+(cherry picked from commit 462b06033e66a32308d940eb5fc47f5e4c914dc0)
+--- a/present/present_event.c
++++ b/present/present_event.c
+@@ -102,7 +102,8 @@ present_event_swap(xGenericEvent *from, xGenericEvent *to)
+ }
+ 
+ void
+-present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int 
bw, WindowPtr sibling)
++present_send_config_notify(WindowPtr window, int x, int y, int w, int h,
++                           int bw, WindowPtr sibling, CARD32 flags)
+ {
+     present_window_priv_ptr window_priv = present_window_priv(window);
+ 
+@@ -122,7 +123,7 @@ present_send_config_notify(WindowPtr window, int x, int y, 
int w, int h, int bw,
+             .off_y = 0,
+             .pixmap_width = w,
+             .pixmap_height = h,
+-            .pixmap_flags = 0
++            .pixmap_flags = flags
+         };
+         present_event_ptr event;
+ 
+--- a/present/present_priv.h
++++ b/present/present_priv.h
+@@ -43,6 +43,11 @@
+ #define DebugPresent(x)
+ #endif
+ 
++/* XXX this belongs in presentproto */
++#ifndef PresentWindowDestroyed
++#define PresentWindowDestroyed (1 << 0)
++#endif
++
+ extern int present_request;
+ 
+ extern DevPrivateKeyRec present_screen_private_key;
+@@ -307,7 +312,7 @@ void
+ present_free_events(WindowPtr window);
+ 
+ void
+-present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int 
bw, WindowPtr sibling);
++present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int 
bw, WindowPtr sibling, CARD32 flags);
+ 
+ void
+ present_send_complete_notify(WindowPtr window, CARD8 kind, CARD8 mode, CARD32 
serial, uint64_t ust, uint64_t msc);
+--- a/present/present_screen.c
++++ b/present/present_screen.c
+@@ -93,6 +93,15 @@ present_destroy_window(WindowPtr window)
+     present_screen_priv_ptr screen_priv = present_screen_priv(screen);
+     present_window_priv_ptr window_priv = present_window_priv(window);
+ 
++    present_send_config_notify(window,
++                               window->drawable.x,
++                               window->drawable.y,
++                               window->drawable.width,
++                               window->drawable.height,
++                               window->borderWidth,
++                               window->nextSib,
++                               PresentWindowDestroyed);
++
+     if (window_priv) {
+         present_clear_window_notifies(window);
+         present_free_events(window);
+@@ -123,7 +132,7 @@ present_config_notify(WindowPtr window,
+     ScreenPtr screen = window->drawable.pScreen;
+     present_screen_priv_ptr screen_priv = present_screen_priv(screen);
+ 
+-    present_send_config_notify(window, x, y, w, h, bw, sibling);
++    present_send_config_notify(window, x, y, w, h, bw, sibling, 0);
+ 
+     unwrap(screen_priv, screen, ConfigNotify);
+     if (screen->ConfigNotify)
+-- 
+GitLab

diff --git a/x11-base/xorg-server/xorg-server-21.1.8-r1.ebuild 
b/x11-base/xorg-server/xorg-server-21.1.8-r1.ebuild
new file mode 100644
index 000000000000..654737cbf8be
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-21.1.8-r1.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XORG_TARBALL_SUFFIX="xz"
+XORG_EAUTORECONF="no"
+inherit flag-o-matic xorg-3 meson
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git";
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+if [[ ${PV} != 9999* ]]; then
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+IUSE_SERVERS="xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev 
unwind xcsecurity"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+       media-libs/libglvnd[X]
+       dev-libs/libbsd
+       dev-libs/openssl:0=
+       >=x11-apps/iceauth-1.0.2
+       >=x11-apps/rgb-1.0.3
+       >=x11-apps/xauth-1.0.3
+       x11-apps/xkbcomp
+       >=x11-libs/libdrm-2.4.89
+       >=x11-libs/libpciaccess-0.12.901
+       >=x11-libs/libXau-1.0.4
+       >=x11-libs/libXdmcp-1.0.2
+       >=x11-libs/libXfont2-2.0.1
+       >=x11-libs/libxkbfile-1.0.4
+       >=x11-libs/libxshmfence-1.1
+       >=x11-libs/pixman-0.27.2
+       >=x11-misc/xbitmaps-1.0.1
+       >=x11-misc/xkeyboard-config-2.4.1-r3
+       xorg? (
+               >=x11-libs/libxcvt-0.1.0
+       )
+       xnest? (
+               >=x11-libs/libXext-1.0.99.4
+               >=x11-libs/libX11-1.1.5
+       )
+       xephyr? (
+               x11-libs/libxcb
+               x11-libs/xcb-util
+               x11-libs/xcb-util-image
+               x11-libs/xcb-util-keysyms
+               x11-libs/xcb-util-renderutil
+               x11-libs/xcb-util-wm
+       )
+       !minimal? (
+               >=media-libs/mesa-18[X(+),egl(+),gbm(+)]
+               >=media-libs/libepoxy-1.5.4[X,egl(+)]
+       )
+       udev? ( virtual/libudev:= )
+       unwind? ( sys-libs/libunwind:= )
+       selinux? (
+               sys-process/audit
+               sys-libs/libselinux:=
+       )
+       systemd? (
+               sys-apps/dbus
+               sys-apps/systemd
+       )
+       elogind? (
+               sys-apps/dbus
+               sys-auth/elogind[pam]
+               sys-auth/pambase[elogind]
+       )
+       !!x11-drivers/nvidia-drivers[-libglvnd(+)]
+"
+DEPEND="${CDEPEND}
+       >=x11-base/xorg-proto-2021.4.99.2
+       >=x11-libs/xtrans-1.3.5
+       media-fonts/font-util
+       test? ( >=x11-libs/libxcvt-0.1.0 )
+"
+RDEPEND="${CDEPEND}
+       !systemd? ( gui-libs/display-manager-init )
+       selinux? ( sec-policy/selinux-xserver )
+       xorg? ( >=x11-apps/xinit-1.3.3-r1 )
+"
+BDEPEND="
+       sys-devel/flex
+"
+PDEPEND="
+       xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
+
+REQUIRED_USE="!minimal? (
+               || ( ${IUSE_SERVERS} )
+       )
+       elogind? ( udev )
+       ?? ( elogind systemd )"
+
+UPSTREAMED_PATCHES=(
+       "${FILESDIR}"/${P}-deadlock.patch
+)
+
+PATCHES=(
+       "${UPSTREAMED_PATCHES[@]}"
+       "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+       # needed for new eselect-opengl, bug #541232
+       "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+)
+
+src_configure() {
+       # bug #835653
+       use x86 && replace-flags -Os -O2
+
+       # localstatedir is used for the log location; we need to override the 
default
+       #       from ebuild.sh
+       # sysconfdir is used for the xorg.conf location; same applies
+       local emesonargs=(
+               --localstatedir "${EPREFIX}/var"
+               --sysconfdir "${EPREFIX}/etc/X11"
+               --buildtype $(usex debug debug plain)
+               -Db_ndebug=$(usex debug false true)
+               $(meson_use !minimal dri1)
+               $(meson_use !minimal dri2)
+               $(meson_use !minimal dri3)
+               $(meson_use !minimal glamor)
+               $(meson_use !minimal glx)
+               $(meson_use udev)
+               $(meson_use udev udev_kms)
+               $(meson_use unwind libunwind)
+               $(meson_use xcsecurity)
+               $(meson_use selinux xselinux)
+               $(meson_use xephyr)
+               $(meson_use xnest)
+               $(meson_use xorg)
+               $(meson_use xvfb)
+               -Ddocs=false
+               -Ddrm=true
+               -Ddtrace=false
+               -Dipv6=true
+               -Dhal=false
+               -Dlinux_acpi=false
+               -Dlinux_apm=false
+               -Dsecure-rpc=false
+               -Dsha1=libcrypto
+               -Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
+       )
+
+       if [[ ${PV} == 9999 ]] ; then
+               # Gone in 21.1.x, but not in master.
+               emesonargs+=( -Dxwayland=false )
+       fi
+
+       if use systemd || use elogind; then
+               emesonargs+=(
+                       -Dsystemd_logind=true
+                       $(meson_use suid suid_wrapper)
+               )
+       else
+               emesonargs+=(
+                       -Dsystemd_logind=false
+                       -Dsuid_wrapper=false
+               )
+       fi
+
+       meson_src_configure
+}
+
+src_install() {
+       meson_src_install
+
+       # The meson build system does not support install-setuid
+       if ! use systemd && ! use elogind; then
+               if use suid; then
+                       chmod u+s "${ED}"/usr/bin/Xorg
+               fi
+       fi
+
+       if ! use xorg; then
+               rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
+                       "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+                       "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+                       "${ED}"/usr/share/man/man1/Xserver.1x || die
+       fi
+
+       # install the @x11-module-rebuild set for Portage
+       insinto /usr/share/portage/config/sets
+       newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postrm() {
+       # Get rid of module dir to ensure opengl-update works properly
+       if [[ -z ${REPLACED_BY_VERSION} && -e 
${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+               rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+       fi
+}

Reply via email to