diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
commit | 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch) | |
tree | b9791a06ab3284e27b568412c59316c66240c682 /x11-base/xorg-server | |
parent | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff) |
gentoo resync : 22.12.2021
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r-- | x11-base/xorg-server/Manifest | 11 | ||||
-rw-r--r-- | x11-base/xorg-server/files/xorg-server-21.1.2-fix-resume-logind.patch | 148 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.14.ebuild (renamed from x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild) | 18 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-21.1.2-r3.ebuild (renamed from x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild) | 31 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 30 |
5 files changed, 193 insertions, 45 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 7c19f6e3e982..2fa8b9c27939 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,10 +1,11 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5 AUX xorg-server-21.1.1-DPI-revert.patch 5333 BLAKE2B 65a32a38bc08660d0b77c3d95a0ffdf36945a46d873f908e16aa93fdc2f48cdcbbd06ec754077d3690be1b17707da8f4bc4fbdb4e833281167769d4453487535 SHA512 20dfdd57e6038aac931ac4b3cc322dcfb594a9ba8b58786e95c442891ec4f12c16b238672dc41983eb68c0ad0f7be4c0bf5479d99b9f64f8f7a9578250f48c1d +AUX xorg-server-21.1.2-fix-resume-logind.patch 5634 BLAKE2B 15528bd26a26a701b374110f1505cd1ed75872ad6bb74e53a6c897e7edd15a074e3abd3bcca08a31cdc5d368e3fa71915ff970c427563cfb5443167b11fd4bd6 SHA512 39033c81d24ffcdb4e6b7eb5d6bcdb0083a4b6940e1ee5f256bc9f0e917a6dd821304b84b2a8752c4a4597aa72730d1f44a67079527842dd01faeebedead5b63 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 -DIST xorg-server-1.20.13.tar.xz 5122260 BLAKE2B 4435d25d8b379142fcc4bf60d82e52417ac3ab22a77ededa1472785d67c23bfb95be8e10465fc4859645405b8e580d6dcb262caea39c408e724d0e5ea61b37af SHA512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3 -DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d -EBUILD xorg-server-1.20.13-r1.ebuild 5233 BLAKE2B ba5938c842d7c4688907b62de72e7f8aeacd1657f3e0dff6de81fb6d3eb234f7c1a6e628d29d332fbfa2809f90e19bfdef9a66d34f6fe0ce478352fbbabb54f5 SHA512 17de9e4c9a8639a750210eeb5c751fd365a088d9e4aefb5b80447d0a6246a8d5312e36ee26d612bcefc4492d2d16d8136e969db443a8ec00f7d95c7b03c3d123 -EBUILD xorg-server-21.1.1-r2.ebuild 4382 BLAKE2B 856d6fd11d78ef9421ee8bb55ee1100cf61b1f6750983f6719f673b12f4f8205f344d481b0b245840ced1eb0121e01cc5d0c69af52fbb0d7f4e1775e750fbe4e SHA512 734cadb72e5a28fc818f10e7563a7c311a092cd7658d29f60579d7d626b5fe09720771324d6e49cd0bc64b0b63152175e7941e19beba5c6b5a4a73deb4b31cd0 -EBUILD xorg-server-9999.ebuild 4364 BLAKE2B 5046f3e7a18c3a641800aba984219f35b35b1f09b2a500b40682665ae4001756e5ec8820b704d05c80b3b57212e7de0478edd731d4b9aafbba0868b90b13421b SHA512 9589abe381e82610c0f9865d0c025f5764c08d659dea94c41e14f251d05d0ae314c54360fafe57ba235f64a337521050570aadc29ed204ab4d302d454e94e3f8 +DIST xorg-server-1.20.14.tar.xz 5178288 BLAKE2B e60cbb6f3023639598d518fb53e3df3a2aced8f8950279f3a1642ad0a9545bea756574c4d41383cba966dc76c317859065b2290c8420668547f26f1d6e508da3 SHA512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963 +DIST xorg-server-21.1.2.tar.xz 4967784 BLAKE2B 352c8717dbbceb547e84610db3983bcfc83d4d72f02f6658ce6c7faa88821a60b401824e76a02bbce617d6646cd474a21823a4b7b75270512bbfd37957dff18d SHA512 6d7a0d29d5be09f80ed505c4d6ae964795127525a0ab73a4eab4f601788ab3627033143e5aeb4c2565c6683dd3402084d13acab5554606fbd519c4aec0a79def +EBUILD xorg-server-1.20.14.ebuild 5101 BLAKE2B 92557bb8ff4afb0c4d62a2e4a2d42eabd05a6d99cd45f574b91a24d378938133f11cfd6b1a7f69ec60b51a72745d701ccf1f3bc97493ba13f76add6aa3430453 SHA512 c52f33f276b48dddaea825343147f33f0e73f47be6e03aa1e7d12b2fa4d43df6249a480645a78b6c21870499a2545e0e022e9606defb2a2878cd70e699db3427 +EBUILD xorg-server-21.1.2-r3.ebuild 4432 BLAKE2B 5be72c01f815b0e05ab5500a40a866e057cd32286b81574d97a6a21aec033904407271d9c522a37c54f8eabf3e2869413eb93bae3fb557b758a950f15089f994 SHA512 3770f8ba34fe4ecfcbc031908fc537d65ca54fbfbd7e61f7b28af5fb784f9dee968870aabe7f88dfefdbac48edc4b37d47e161bf3986479cfff0026ccc36b061 +EBUILD xorg-server-9999.ebuild 4388 BLAKE2B 0d52b9bd06c561fa1b14c9833c450ee3800f8703b5794359f20c78b960f3de9729dcc4ae279caacb18eba72e9be51a3fd1e2e4afb79f338325f8a7b542487aec SHA512 aa0acb2a0710f2651fad7167aa26978b97ad02bea103b29b6e5e7edf051a7efb7f121b1d80f45e5b3208e93e71cbc4e7406b53192534a47f159fe5ff34c173f1 MISC metadata.xml 896 BLAKE2B cdcbd8758222413b63e88487aa887654f80fac5e245563e99cc8fa9de5af6ab5da3da2ff499230a1e897b3e051a692e62100e8864fc0cfde128365f85d715d08 SHA512 51970dfe9c2ef9a00dd4095246160f344fa9df76defbd4f0c43e07062b36d4c4f027cd77d0de7d7d70a91995f3e898c4537111b0191298e331fe14586a2d8637 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 000000000000..1d16e132f62a --- /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 <jfalempe@redhat.com> +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 <jfalempe@redhat.com> +Reviewed-by: Hans de Goede <hdegoede@redhat.com> +--- 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 <jfalempe@redhat.com> +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 <jfalempe@redhat.com> +Tested-by: Olivier Fourdan <ofourdan@redhat.com> +Reviewed-by: Hans de Goede <hdegoede@redhat.com> +--- 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-1.20.13-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.14.ebuild index 70f50b24ca30..0c0e77d2d5a9 100644 --- a/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.14.ebuild @@ -3,7 +3,6 @@ EAPI=7 -XORG_DOC=doc XORG_TARBALL_SUFFIX="xz" inherit xorg-3 toolchain-funcs EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" @@ -15,7 +14,7 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" RESTRICT="!test? ( test )" CDEPEND=" @@ -83,15 +82,6 @@ CDEPEND=" DEPEND="${CDEPEND} >=x11-base/xorg-proto-2018.4 >=x11-libs/xtrans-1.3.5 - dmx? ( - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - ) " RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) @@ -127,7 +117,6 @@ src_configure() { # NOTE: fop is used for doc generating; and I have no idea if Gentoo # package it somewhere local XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) $(use_enable debug) $(use_enable dmx) $(use_enable kdrive) @@ -146,9 +135,8 @@ src_configure() { $(use_enable xorg) $(use_enable xvfb) $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) $(use_with systemd systemd-daemon) + --enable-ipv6 --disable-xwayland --enable-libdrm --sysconfdir="${EPREFIX}"/etc/X11 @@ -158,7 +146,9 @@ src_configure() { --disable-config-hal --disable-linux-acpi --without-dtrace + --without-doxygen --without-fop + --without-xmlto --with-os-vendor=Gentoo --with-sha1=libcrypto CPP="$(tc-getPROG CPP cpp)" diff --git a/x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild b/x11-base/xorg-server/xorg-server-21.1.2-r3.ebuild index 9e885eb74813..3f1a181bcf83 100644 --- a/x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild +++ b/x11-base/xorg-server/xorg-server-21.1.2-r3.ebuild @@ -3,7 +3,6 @@ EAPI=7 -XORG_DOC=doc XORG_TARBALL_SUFFIX="xz" XORG_EAUTORECONF="no" inherit xorg-3 meson @@ -21,6 +20,7 @@ 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 @@ -55,7 +55,6 @@ CDEPEND=" ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) - >=x11-apps/xinit-1.3.3-r1 selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/dbus @@ -71,13 +70,12 @@ CDEPEND=" DEPEND="${CDEPEND} >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 - doc? ( - x11-base/xorg-sgml-doctools - ) + 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 @@ -92,7 +90,7 @@ REQUIRED_USE="!minimal? ( ?? ( elogind systemd )" UPSTREAMED_PATCHES=( - "${FILESDIR}"/${P}-DPI-revert.patch + "${FILESDIR}"/${P}-fix-resume-logind.patch ) PATCHES=( @@ -106,15 +104,12 @@ 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) @@ -128,17 +123,23 @@ src_configure() { $(meson_use xnest) $(meson_use xorg) $(meson_use xvfb) - -Ddefault_font_path="${EPREFIX}"/usr/share/fonts + -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 @@ -147,7 +148,7 @@ src_configure() { else emesonargs+=( -Dsystemd_logind=false - $(meson_use suid suid_wrapper) + -Dsuid_wrapper=false ) fi @@ -157,8 +158,12 @@ src_configure() { src_install() { meson_src_install - #The new meson build system do not leave X symlink - ln -s Xorg "${ED}"/usr/bin/X + # 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 \ diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 2fb9a72911bc..05df79d40fe4 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -3,7 +3,6 @@ EAPI=7 -XORG_DOC=doc XORG_TARBALL_SUFFIX="xz" XORG_EAUTORECONF="no" inherit xorg-3 meson @@ -21,6 +20,7 @@ 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 @@ -55,7 +55,6 @@ CDEPEND=" ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) - >=x11-apps/xinit-1.3.3-r1 selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/dbus @@ -71,13 +70,12 @@ CDEPEND=" DEPEND="${CDEPEND} >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 - doc? ( - x11-base/xorg-sgml-doctools - ) + 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 @@ -105,15 +103,12 @@ 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) @@ -127,18 +122,23 @@ src_configure() { $(meson_use xnest) $(meson_use xorg) $(meson_use xvfb) - -Ddefault_font_path="${EPREFIX}"/usr/share/fonts + -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" - -Dxwayland=false ) + 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 @@ -147,7 +147,7 @@ src_configure() { else emesonargs+=( -Dsystemd_logind=false - $(meson_use suid suid_wrapper) + -Dsuid_wrapper=false ) fi @@ -157,8 +157,12 @@ src_configure() { src_install() { meson_src_install - #The new meson build system do not leave X symlink - ln -s Xorg "${ED}"/usr/bin/X + # 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 \ |