From 9a7df2dd38039ddc6b68cfe280bbc7f79ddfb95f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 19:28:48 +0000 Subject: x11-base/xorg-server : version bump --- .../md5-cache/x11-base/xorg-server-21.1.1-r100 | 18 -- .../md5-cache/x11-base/xorg-server-21.1.2-r100 | 18 ++ metadata/pkg_desc_index | 2 +- x11-base/xorg-server/Manifest | 2 +- .../files/xorg-server-21.1.1-DPI-revert.patch | 133 --------------- .../xorg-server-21.1.2-fix-resume-logind.patch | 148 ++++++++++++++++ .../xorg-server/xorg-server-21.1.1-r100.ebuild | 184 -------------------- .../xorg-server/xorg-server-21.1.2-r100.ebuild | 188 +++++++++++++++++++++ 8 files changed, 356 insertions(+), 337 deletions(-) delete mode 100644 metadata/md5-cache/x11-base/xorg-server-21.1.1-r100 create mode 100644 metadata/md5-cache/x11-base/xorg-server-21.1.2-r100 delete mode 100644 x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch create mode 100644 x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch delete mode 100644 x11-base/xorg-server/xorg-server-21.1.1-r100.ebuild create mode 100644 x11-base/xorg-server/xorg-server-21.1.2-r100.ebuild diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.1-r100 b/metadata/md5-cache/x11-base/xorg-server-21.1.1-r100 deleted file mode 100644 index cbca953f..00000000 --- a/metadata/md5-cache/x11-base/xorg-server-21.1.1-r100 +++ /dev/null @@ -1,18 +0,0 @@ -BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) ) >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array -DEFINED_PHASES=compile configure install postinst postrm prepare test unpack -DEPEND=media-libs/libglvnd[X] 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/libxcvt-0.1.0 >=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 >=x11-libs/libXext-1.0.5 x11-libs/libXv xephyr? ( x11-libs/libxcb[xkb] 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? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 selinux? ( 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(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 doc? ( x11-base/xorg-sgml-doctools ) -DESCRIPTION=X.Org X servers -EAPI=7 -HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server -INHERIT=xorg-3 meson -IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity doc -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux -LICENSE=MIT -PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 ) -RDEPEND=media-libs/libglvnd[X] 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/libxcvt-0.1.0 >=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 >=x11-libs/libXext-1.0.5 x11-libs/libXv xephyr? ( x11-libs/libxcb[xkb] 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? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 selinux? ( 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(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) -REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) -RESTRICT=!test? ( test ) -SLOT=0/21.1.1 -SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.1.tar.xz -_eclasses_=autotools c9df06c186913b43eb211100ef5fe2cf eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 gnuconfig 262062cef0ba4f22b397193da514a350 libtool 241a8f577b9781a42a7421e53448a44e meson 9f3e84959ae1d60e19bc91f212774dcc multilib 4b66d835ec72e021e359bb81eacfe988 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 python-utils-r1 a8b7938ade305f087865de7e52d079b5 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa wrapper 4251d4c84c25f59094fd557e0063a974 xorg-3 4c1d5c48b38c2a0457352b812ac916a8 -_md5_=c1af138a69347527d753644ff92b3036 diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.2-r100 b/metadata/md5-cache/x11-base/xorg-server-21.1.2-r100 new file mode 100644 index 00000000..40e66f01 --- /dev/null +++ b/metadata/md5-cache/x11-base/xorg-server-21.1.2-r100 @@ -0,0 +1,18 @@ +BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig >=dev-util/meson-0.58.2-r1 >=dev-util/ninja-1.8.2 dev-util/meson-format-array +DEFINED_PHASES=compile configure install postinst postrm prepare test unpack +DEPEND=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/libxcvt-0.1.0 >=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 >=x11-libs/libXext-1.0.5 x11-libs/libXv xephyr? ( x11-libs/libxcb[xkb] 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? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util +DESCRIPTION=X.Org X servers +EAPI=7 +HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server +INHERIT=xorg-3 meson +IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux +LICENSE=MIT +PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 ) +RDEPEND=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/libxcvt-0.1.0 >=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 >=x11-libs/libXext-1.0.5 x11-libs/libXv xephyr? ( x11-libs/libxcb[xkb] 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? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 ) +REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) +RESTRICT=!test? ( test ) +SLOT=0/21.1.2 +SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.2.tar.xz +_eclasses_=autotools c9df06c186913b43eb211100ef5fe2cf eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 gnuconfig 262062cef0ba4f22b397193da514a350 libtool 241a8f577b9781a42a7421e53448a44e meson 9f3e84959ae1d60e19bc91f212774dcc multilib 4b66d835ec72e021e359bb81eacfe988 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 python-utils-r1 a8b7938ade305f087865de7e52d079b5 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa wrapper 4251d4c84c25f59094fd557e0063a974 xorg-3 4c1d5c48b38c2a0457352b812ac916a8 +_md5_=7efbc525843e429da089319e18c03b61 diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index f96e4491..3b67e29f 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -85,7 +85,7 @@ virtual/rust 100: Virtual for Rust language compiler virtual/tmpfiles 0-r100: Virtual to select between different tmpfiles.d handlers virtual/udev 1000: Virtual to select between different udev daemon providers x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg drivers (dummy package) -x11-base/xorg-server 21.1.1-r100: X.Org X servers +x11-base/xorg-server 21.1.2-r100: X.Org X servers x11-base/xwayland 21.1.4-r100: Standalone X server running under Wayland x11-drivers/nvidia-drivers 470.94: NVIDIA Accelerated Graphics Driver x11-drivers/nvidia-drivers-legacy 390.147: NVIDIA Accelerated Graphics Driver diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 6b5fa2ca..67e6b1a4 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1 +1 @@ -DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d +DIST xorg-server-21.1.2.tar.xz 4967784 BLAKE2B 352c8717dbbceb547e84610db3983bcfc83d4d72f02f6658ce6c7faa88821a60b401824e76a02bbce617d6646cd474a21823a4b7b75270512bbfd37957dff18d SHA512 6d7a0d29d5be09f80ed505c4d6ae964795127525a0ab73a4eab4f601788ab3627033143e5aeb4c2565c6683dd3402084d13acab5554606fbd519c4aec0a79def diff --git a/x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch b/x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch deleted file mode 100644 index 89d8e265..00000000 --- a/x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch +++ /dev/null @@ -1,133 +0,0 @@ -https://gitlab.freedesktop.org/xorg/xserver/-/commit/35af1299e73483eaf93d913a960e1d1738bc7de6 - -From: Povilas Kanapickas -Date: Sat, 13 Nov 2021 17:23:54 +0200 -Subject: [PATCH] Revert "hw/xfree86: Propagate physical dimensions from DRM - connector" - -Quite a lot of applications currently expect the screen DPI exposed by -the X server to be 96 even when the real display DPI is different. -Additionally, currently Xwayland completely ignores any hardware -information and sets the DPI to 96. Accordingly the new behavior, even -if it fixes a bug, should not be enabled automatically to all users. - -A better solution would be to make the default DPI stay as is and enable -the correct behavior with a command line option (maybe -dpi auto, or -similar). For now let's just revert the bug fix. - -This reverts commit 05b3c681ea2f478c0cb941c2f8279919cf78de6d. - -Signed-off-by: Povilas Kanapickas ---- a/hw/xfree86/common/xf86Helper.c -+++ b/hw/xfree86/common/xf86Helper.c -@@ -55,7 +55,6 @@ - #include "xf86Xinput.h" - #include "xf86InPriv.h" - #include "mivalidate.h" --#include "xf86Crtc.h" - - /* For xf86GetClocks */ - #if defined(CSRG_BASED) || defined(__GNU__) -@@ -852,9 +851,8 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) - { - MessageType from = X_DEFAULT; - xf86MonPtr DDC = (xf86MonPtr) (pScrn->monitor->DDC); -- int probedWidthmm, probedHeightmm; -+ int ddcWidthmm, ddcHeightmm; - int widthErr, heightErr; -- xf86OutputPtr compat = xf86CompatOutput(pScrn); - - /* XXX Maybe there is no need for widthmm/heightmm in ScrnInfoRec */ - pScrn->widthmm = pScrn->monitor->widthmm; -@@ -864,15 +862,11 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) - /* DDC gives display size in mm for individual modes, - * but cm for monitor - */ -- probedWidthmm = DDC->features.hsize * 10; /* 10mm in 1cm */ -- probedHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */ -- } -- else if (compat && compat->mm_width > 0 && compat->mm_height > 0) { -- probedWidthmm = compat->mm_width; -- probedHeightmm = compat->mm_height; -+ ddcWidthmm = DDC->features.hsize * 10; /* 10mm in 1cm */ -+ ddcHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */ - } - else { -- probedWidthmm = probedHeightmm = 0; -+ ddcWidthmm = ddcHeightmm = 0; - } - - if (monitorResolution > 0) { -@@ -898,15 +892,15 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) - pScrn->widthmm, pScrn->heightmm); - - /* Warn if config and probe disagree about display size */ -- if (probedWidthmm && probedHeightmm) { -+ if (ddcWidthmm && ddcHeightmm) { - if (pScrn->widthmm > 0) { -- widthErr = abs(probedWidthmm - pScrn->widthmm); -+ widthErr = abs(ddcWidthmm - pScrn->widthmm); - } - else { - widthErr = 0; - } - if (pScrn->heightmm > 0) { -- heightErr = abs(probedHeightmm - pScrn->heightmm); -+ heightErr = abs(ddcHeightmm - pScrn->heightmm); - } - else { - heightErr = 0; -@@ -915,17 +909,17 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) - /* Should include config file name for monitor here */ - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Probed monitor is %dx%d mm, using Displaysize %dx%d mm\n", -- probedWidthmm, probedHeightmm, pScrn->widthmm, -+ ddcWidthmm, ddcHeightmm, pScrn->widthmm, - pScrn->heightmm); - } - } - } -- else if (probedWidthmm && probedHeightmm) { -+ else if (ddcWidthmm && ddcHeightmm) { - from = X_PROBED; - xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n", -- probedWidthmm, probedHeightmm); -- pScrn->widthmm = probedWidthmm; -- pScrn->heightmm = probedHeightmm; -+ ddcWidthmm, ddcHeightmm); -+ pScrn->widthmm = ddcWidthmm; -+ pScrn->heightmm = ddcHeightmm; - if (pScrn->widthmm > 0) { - pScrn->xDpi = - (int) ((double) pScrn->virtualX * MMPERINCH / pScrn->widthmm); ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -3256,10 +3256,8 @@ xf86OutputSetEDID(xf86OutputPtr output, xf86MonPtr edid_mon) - free(output->MonInfo); - - output->MonInfo = edid_mon; -- if (edid_mon) { -- output->mm_width = 0; -- output->mm_height = 0; -- } -+ output->mm_width = 0; -+ output->mm_height = 0; - - if (debug_modes) { - xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n", ---- a/hw/xfree86/modes/xf86RandR12.c -+++ b/hw/xfree86/modes/xf86RandR12.c -@@ -806,12 +806,6 @@ xf86RandR12CreateScreenResources(ScreenPtr pScreen) - mmWidth = output->conf_monitor->mon_width; - mmHeight = output->conf_monitor->mon_height; - } -- else if (output && -- (output->mm_width > 0 && -- output->mm_height > 0)) { -- mmWidth = output->mm_width; -- mmHeight = output->mm_height; -- } - else { - /* - * Otherwise, just set the screen to DEFAULT_DPI -GitLab diff --git a/x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch b/x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch new file mode 100644 index 00000000..1d16e132 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch @@ -0,0 +1,148 @@ +Merged upstream into master, this is the backport PR variant. + +https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/833 +https://bugs.gentoo.org/829496 + +From: Jocelyn Falempe +Date: Thu, 16 Dec 2021 15:46:43 +0100 +Subject: [PATCH 1/2] xf86/logind: Fix compilation error when built without + logind/platform bus + +This was introduced by commit 8eb1396d + +Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1269 +Fixes: da9d012a9 - xf86/logind: Fix drm_drop_master before vt_reldisp + +Signed-off-by: Jocelyn Falempe +Reviewed-by: Hans de Goede +--- a/hw/xfree86/common/xf86Events.c ++++ b/hw/xfree86/common/xf86Events.c +@@ -383,14 +383,7 @@ xf86VTLeave(void) + xf86GPUScreens[i]->LeaveVT(xf86GPUScreens[i]); + + if (systemd_logind_controls_session()) { +- for (i = 0; i < xf86_num_platform_devices; i++) { +- if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) { +- int major, minor; +- major = xf86_platform_odev_attributes(i)->major; +- minor = xf86_platform_odev_attributes(i)->minor; +- systemd_logind_drop_master(major, minor); +- } +- } ++ systemd_logind_drop_master(); + } + + if (!xf86VTSwitchAway()) +--- a/hw/xfree86/os-support/linux/systemd-logind.c ++++ b/hw/xfree86/os-support/linux/systemd-logind.c +@@ -308,13 +308,19 @@ cleanup: + * and ensure the drm_drop_master is done before + * VT_RELDISP when switching VT + */ +-void systemd_logind_drop_master(int _major, int _minor) ++void systemd_logind_drop_master(void) + { +- struct systemd_logind_info *info = &logind_info; +- dbus_int32_t major = _major; +- dbus_int32_t minor = _minor; ++ int i; ++ for (i = 0; i < xf86_num_platform_devices; i++) { ++ if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) { ++ dbus_int32_t major, minor; ++ struct systemd_logind_info *info = &logind_info; + +- systemd_logind_ack_pause(info, minor, major); ++ major = xf86_platform_odev_attributes(i)->major; ++ minor = xf86_platform_odev_attributes(i)->minor; ++ systemd_logind_ack_pause(info, minor, major); ++ } ++ } + } + + static DBusHandlerResult +--- a/include/systemd-logind.h ++++ b/include/systemd-logind.h +@@ -33,7 +33,7 @@ int systemd_logind_take_fd(int major, int minor, const char *path, Bool *paus); + void systemd_logind_release_fd(int major, int minor, int fd); + int systemd_logind_controls_session(void); + void systemd_logind_vtenter(void); +-void systemd_logind_drop_master(int major, int minor); ++void systemd_logind_drop_master(void); + #else + #define systemd_logind_init() + #define systemd_logind_fini() +@@ -41,7 +41,7 @@ void systemd_logind_drop_master(int major, int minor); + #define systemd_logind_release_fd(major, minor, fd) close(fd) + #define systemd_logind_controls_session() 0 + #define systemd_logind_vtenter() +-#define systemd_logind_drop_master(major, minor) ++#define systemd_logind_drop_master() + #endif + + #endif +GitLab +From 66890ca569291a53ea9cdc6ec19070173e522260 Mon Sep 17 00:00:00 2001 +From: Jocelyn Falempe +Date: Fri, 17 Dec 2021 10:18:25 +0100 +Subject: [PATCH 2/2] xf86/logind: fix missing call to vtenter if the platform + device is not paused + +If there is one platform device, which is not paused nor resumed, +systemd_logind_vtenter() will never get called. +This break suspend/resume, and switching to VT on system with Nvidia +proprietary driver. +This is a regression introduced by f5bd039633fa83 + +So now call systemd_logind_vtenter() if there are no paused +platform devices. + +Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1271 +Fixes: f5bd0396 - xf86/logind: fix call systemd_logind_vtenter after receiving drm device resume + +Signed-off-by: Jocelyn Falempe +Tested-by: Olivier Fourdan +Reviewed-by: Hans de Goede +--- a/hw/xfree86/os-support/linux/systemd-logind.c ++++ b/hw/xfree86/os-support/linux/systemd-logind.c +@@ -316,6 +316,7 @@ void systemd_logind_drop_master(void) + dbus_int32_t major, minor; + struct systemd_logind_info *info = &logind_info; + ++ xf86_platform_devices[i].flags |= XF86_PDEV_PAUSED; + major = xf86_platform_odev_attributes(i)->major; + minor = xf86_platform_odev_attributes(i)->minor; + systemd_logind_ack_pause(info, minor, major); +@@ -323,6 +324,16 @@ void systemd_logind_drop_master(void) + } + } + ++static Bool are_platform_devices_resumed(void) { ++ int i; ++ for (i = 0; i < xf86_num_platform_devices; i++) { ++ if (xf86_platform_devices[i].flags & XF86_PDEV_PAUSED) { ++ return FALSE; ++ } ++ } ++ return TRUE; ++} ++ + static DBusHandlerResult + message_filter(DBusConnection * connection, DBusMessage * message, void *data) + { +@@ -416,13 +427,11 @@ message_filter(DBusConnection * connection, DBusMessage * message, void *data) + + if (pdev) { + pdev->flags &= ~XF86_PDEV_PAUSED; +- systemd_logind_vtenter(); + } else + systemd_logind_set_input_fd_for_all_devs(major, minor, fd, + info->vt_active); +- +- /* Always call vtenter(), only if there are only legacy video devs */ +- if (!xf86_num_platform_devices) ++ /* Call vtenter if all platform devices are resumed, or if there are no platform device */ ++ if (are_platform_devices_resumed()) + systemd_logind_vtenter(); + } + return DBUS_HANDLER_RESULT_HANDLED; +GitLab diff --git a/x11-base/xorg-server/xorg-server-21.1.1-r100.ebuild b/x11-base/xorg-server/xorg-server-21.1.1-r100.ebuild deleted file mode 100644 index b8aa75db..00000000 --- a/x11-base/xorg-server/xorg-server-21.1.1-r100.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DOC=doc -XORG_TARBALL_SUFFIX="xz" -XORG_EAUTORECONF="no" -inherit 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 ~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/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/libxcvt-0.1.0 - >=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 - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - xephyr? ( - x11-libs/libxcb[xkb] - 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? ( - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXext-1.0.5 - >=media-libs/mesa-18[X(+),egl(+),gbm(+)] - >=media-libs/libepoxy-1.5.4[X,egl(+)] - ) - udev? ( virtual/libudev:= ) - unwind? ( sys-libs/libunwind ) - >=x11-apps/xinit-1.3.3-r1 - selinux? ( 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 - doc? ( - x11-base/xorg-sgml-doctools - ) -" -RDEPEND="${CDEPEND} - !systemd? ( gui-libs/display-manager-init ) - selinux? ( sec-policy/selinux-xserver ) -" -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}-DPI-revert.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() { - # 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 - # NOTE: fop is used for doc generating; and I have no idea if Gentoo - # package it somewhere - - local emesonargs=( - --localstatedir "${EPREFIX}/var" - --sysconfdir "${EPREFIX}/etc/X11" - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - $(meson_use doc docs) - $(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 xephyr) - $(meson_use xnest) - $(meson_use xorg) - $(meson_use xvfb) - -Ddefault_font_path="${EPREFIX}"/usr/share/fonts - -Ddrm=true - -Ddtrace=false - -Dipv6=true - -Dhal=false - -Dlinux_acpi=false - -Dlinux_apm=false - -Dsha1=libcrypto - -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" - ) - - if use systemd || use elogind; then - emesonargs+=( - -Dsystemd_logind=true - $(meson_use suid suid_wrapper) - ) - else - emesonargs+=( - -Dsystemd_logind=false - $(meson_use suid suid_wrapper) - ) - fi - - meson_src_configure -} - -src_install() { - meson_src_install - - #The new meson build system do not leave X symlink - ln -s Xorg "${ED}"/usr/bin/X - - 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 - - # enable clicks using touchpad (https://bugs.redcorelinux.org/show_bug.cgi?id=48) - insinto /usr/share/X11/xorg.conf.d - doins "${FILESDIR}"/99-synaptics-overrides.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 -} diff --git a/x11-base/xorg-server/xorg-server-21.1.2-r100.ebuild b/x11-base/xorg-server/xorg-server-21.1.2-r100.ebuild new file mode 100644 index 00000000..8c49bc02 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-21.1.2-r100.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_TARBALL_SUFFIX="xz" +XORG_EAUTORECONF="no" +inherit 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 ~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/libxcvt-0.1.0 + >=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 + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + xephyr? ( + x11-libs/libxcb[xkb] + 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? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-18[X(+),egl(+),gbm(+)] + >=media-libs/libepoxy-1.5.4[X,egl(+)] + ) + udev? ( virtual/libudev:= ) + unwind? ( sys-libs/libunwind ) + selinux? ( sys-libs/libselinux ) + systemd? ( + sys-apps/dbus + sys-apps/systemd + ) + elogind? ( + sys-apps/dbus + sys-auth/elogind[pam] + sys-auth/pambase[elogind] + ) +" +DEPEND="${CDEPEND} + >=x11-base/xorg-proto-2021.4.99.2 + >=x11-libs/xtrans-1.3.5 + media-fonts/font-util +" +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}-fix-resume-logind.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() { + # 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 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 + + # enable clicks using touchpad (https://bugs.redcorelinux.org/show_bug.cgi?id=48) + insinto /usr/share/X11/xorg.conf.d + doins "${FILESDIR}"/99-synaptics-overrides.conf + + # 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 +} -- cgit v1.2.3