From 159ec3f090554ee5d7f61b2da553833fb7566f99 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Oct 2023 20:44:11 +0100 Subject: gentoo auto-resync : 25:10:2023 - 20:44:11 --- x11-base/Manifest.gz | Bin 1554 -> 1560 bytes x11-base/xorg-server/Manifest | 3 + ...1.9-xephyr-Don-t-check-for-SeatId-anymore.patch | 66 +++++++ x11-base/xorg-server/xorg-server-21.1.9.ebuild | 194 +++++++++++++++++++++ x11-base/xwayland/Manifest | 2 + x11-base/xwayland/xwayland-23.2.2.ebuild | 110 ++++++++++++ 6 files changed, 375 insertions(+) create mode 100644 x11-base/xorg-server/files/xorg-server-21.1.9-xephyr-Don-t-check-for-SeatId-anymore.patch create mode 100644 x11-base/xorg-server/xorg-server-21.1.9.ebuild create mode 100644 x11-base/xwayland/xwayland-23.2.2.ebuild (limited to 'x11-base') diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz index e0b8ba218796..fd3f616e0108 100644 Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index fe10e6d868e3..707aa7a9a053 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -2,8 +2,11 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1b AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5 AUX xorg-server-21.1.8-deadlock.patch 3828 BLAKE2B 5dd351e890d723d477bcb0103365fb9fbc177817f4a8e183959b72fb525e0518dbbd652f91f3537a805c8e674f0ba70f0d0cfa52461c2283033310419311a9ec SHA512 d72e01c289616027c242145ef5bdcc7cac637e846f6f6d3db9a845d25acdffdb8190822e9b3885951cea6351924c4f9c2859fba1904b32e7bf1be24b3bb26d30 AUX xorg-server-21.1.8-wfb.patch 1493 BLAKE2B 6a499269df139bb6fc690b81095f87a2216c28f7ea27d699b2ed463dbd3b41d18f316405877178b79cb205f68c017b924ad9e0dfd18514dda2914fb11e2fb5c1 SHA512 71b2caef0805e36a8257587ee53d313a38783ceb10b04fba9dd373d596a0d9a19e9dbd09bb81c4f9332384cd296b46552846bd7b90be5d84aa5747d23c399fbe +AUX xorg-server-21.1.9-xephyr-Don-t-check-for-SeatId-anymore.patch 2143 BLAKE2B f86ca339ac3f548864e89a85225fae5834edb7115a78d88d1c2456f2c6d4bf5e4ee407cc9ce25affa7d5fdff83e701fd20a8ceaa6eb7c8d61d2ba06abac729ac SHA512 5acdf35c09faf6d64bfe0c34d64f0481b605230112c9e0e1b3b32d9b0539413f8b62f0517f3edb7e1e328fcbb5a8782946b67bda89809da89f23a4770a799194 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937 +DIST xorg-server-21.1.9.tar.xz 4935860 BLAKE2B 8e0a2e0f5fc4d06a08c1424fe618da9822e951f5b744b4cac1b1e14305ab598b162e4f08fb53ba5e60d0001257216755a576b470c961c26a909d66e9a46d1c77 SHA512 9044e1b9222616fb63aea444b75f4ca6582edb7d899018f8ea30359e57edf04b1555e69397ebc4d288f7e36d6b82a54dde3895f11d414573d229e908ac17bfe8 EBUILD xorg-server-21.1.8-r2.ebuild 4597 BLAKE2B 44e32dbbf4dbea188dd2a0084372ae3133266322ba72d50ff614dc36c164d408cbbf1c7da7a31744d7d4a4cc5d511b6698e22aec73b125417c55704594a4e5e5 SHA512 5f56f5881b8a264ed7779e6fe0c6b57c2277912fe2b729c140fa683e056a79d1fb16e7510acd9e49863ebf6b50d589866e143bec58dc7db2b87cd0b86328321a +EBUILD xorg-server-21.1.9.ebuild 4583 BLAKE2B 70e16f20597a197b522c1b271785d949a5665658749c8ee7a5b32da837e2dba2ec118bb716f1c88f688535573ad11f46956196ee34116d22492a9a56584a5324 SHA512 fb470f53a6399d8aed1017cf90c745525b2360e0738a4a489cc10dbd0a5091a82fd86cd15132f90f3104c57283f29666654e4a11f19ed58e1dd7552c85952953 EBUILD xorg-server-9999.ebuild 4494 BLAKE2B 9cadb192373de6971120ba1d5531e95bd9aecb7260b27b96203287b5c63224b727deaadf0e2aa0c0c329bba78881163d8226598fe50a395c646b1503e90327f1 SHA512 a0ad5bff35dea16bf8dab770185975a7f9bb64921a5758172d4807ca1a2ab3f66b3b6d6c6ef25806573cac049135fb2356a690ad24c2669054903305ad20c51c MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90 diff --git a/x11-base/xorg-server/files/xorg-server-21.1.9-xephyr-Don-t-check-for-SeatId-anymore.patch b/x11-base/xorg-server/files/xorg-server-21.1.9-xephyr-Don-t-check-for-SeatId-anymore.patch new file mode 100644 index 000000000000..64581c9d0a18 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-21.1.9-xephyr-Don-t-check-for-SeatId-anymore.patch @@ -0,0 +1,66 @@ +https://bugs.gentoo.org/884221 +https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1192 + +From 4c03b67d334b05b814239420776f2fdd4c4a98ac Mon Sep 17 00:00:00 2001 +From: nerdopolis +Date: Tue, 11 Jan 2022 18:41:42 -0500 +Subject: [PATCH xserver] xephyr: Don't check for SeatId anymore + +After a change for the xserver to automatically determine the seat +based on the XDG_SEAT variable, xephyr stopped working. This was +because of an old feature where xephyr used to handle evdev +directly. This was dropped some time ago, and now this check is +not needed +--- + hw/kdrive/ephyr/ephyrinit.c | 34 ++++++++++++++++------------------ + 1 file changed, 16 insertions(+), 18 deletions(-) + +diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c +index 020461db2..09cd28cb3 100644 +--- a/hw/kdrive/ephyr/ephyrinit.c ++++ b/hw/kdrive/ephyr/ephyrinit.c +@@ -70,25 +70,23 @@ InitInput(int argc, char **argv) + KdKeyboardInfo *ki; + KdPointerInfo *pi; + +- if (!SeatId) { +- KdAddKeyboardDriver(&EphyrKeyboardDriver); +- KdAddPointerDriver(&EphyrMouseDriver); +- +- if (!kdHasKbd) { +- ki = KdNewKeyboard(); +- if (!ki) +- FatalError("Couldn't create Xephyr keyboard\n"); +- ki->driver = &EphyrKeyboardDriver; +- KdAddKeyboard(ki); +- } ++ KdAddKeyboardDriver(&EphyrKeyboardDriver); ++ KdAddPointerDriver(&EphyrMouseDriver); ++ ++ if (!kdHasKbd) { ++ ki = KdNewKeyboard(); ++ if (!ki) ++ FatalError("Couldn't create Xephyr keyboard\n"); ++ ki->driver = &EphyrKeyboardDriver; ++ KdAddKeyboard(ki); ++ } + +- if (!kdHasPointer) { +- pi = KdNewPointer(); +- if (!pi) +- FatalError("Couldn't create Xephyr pointer\n"); +- pi->driver = &EphyrMouseDriver; +- KdAddPointer(pi); +- } ++ if (!kdHasPointer) { ++ pi = KdNewPointer(); ++ if (!pi) ++ FatalError("Couldn't create Xephyr pointer\n"); ++ pi->driver = &EphyrMouseDriver; ++ KdAddPointer(pi); + } + + KdInitInput(); +-- +2.41.0 + diff --git a/x11-base/xorg-server/xorg-server-21.1.9.ebuild b/x11-base/xorg-server/xorg-server-21.1.9.ebuild new file mode 100644 index 000000000000..f4b46fb4d12e --- /dev/null +++ b/x11-base/xorg-server/xorg-server-21.1.9.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/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=( +) + +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 + + "${FILESDIR}"/${P}-xephyr-Don-t-check-for-SeatId-anymore.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 +} diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest index f720b5dd7cfc..d2dc32df9386 100644 --- a/x11-base/xwayland/Manifest +++ b/x11-base/xwayland/Manifest @@ -2,7 +2,9 @@ AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f98 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24 DIST xwayland-23.1.2.tar.xz 1287396 BLAKE2B 56e213ea9d8cfa0ab316fb0a09d623427b7fa6effc6feb2b1d4364ee494b54d82e1863fbba86f824b09bf07b0b83fe5e85595f5cd00fdfa38fd72923922c2ea4 SHA512 796939106e8c986f2e8d6a1ff27f3a51cda0718825c3a6da678573de95a61bcc9fac484a34c6f8f762f7078f5289aa35c393725ea0b0f7e5d153352ab01a48f5 DIST xwayland-23.2.1.tar.xz 1298128 BLAKE2B d871c83c1b5975f1cbd1ae2ee5ab693a277d992c1cd66d40b2b7159a49827e9208321ac7465f5706e2e85ac0c438548cc871a2f34e3391388317bd08aef161de SHA512 8ea3061a175c9163166c69569a81dbee2cad605d140dd25d9b61219db555e775811ebe9716c38b6fa6c591299b7c1dfcd5248e797e341ee4cea49b998be89657 +DIST xwayland-23.2.2.tar.xz 1298400 BLAKE2B a73d6595db3ee1f55b2d04fce652378f3a277fbff2ecdb0b0da25fe7618a8a70b337cedc2fd18044f52a597171c31f4da87147491366dcbac4f048e985e13446 SHA512 f5b319fdace7d7c078544730ecd26afeb63b1a0c779fb097455147945df85af32d9e91501ebdb70209d48e8a3ead3b23be31e9d5118358ac17e699abb4b6ac07 EBUILD xwayland-23.1.2.ebuild 2179 BLAKE2B 228f4234a40c45b54699176b0165902e968021e75b284bae5afff110a3e7eb4437cd8ef651d5a98d4e47226ba87e49186118eb18a412a68906f28c25f80b60fa SHA512 2d5b47ea010a3cad00e89d914a76004bd14c001e5cdaa324ef1438a47951da51c6aab34dce8eb46dcdbbcb6f08ea1acd799c3d5cfb052d5f112e24be0c620d5a EBUILD xwayland-23.2.1.ebuild 2376 BLAKE2B dc483c3a7ed102a16ab669c70a7840accac2b0f6b757cea0ebb0ff36afec56e01ad4a1e967c8ef5588841b792ef805d8930f37e4705e664f50377329ee1cca7e SHA512 073af289523b7e6345fb787c1827ba87084e1201012af8b927240b460540cc129d4edafaef9b742986716a3cba039f2a4d216c27779b87632d8bdea19c6dc506 +EBUILD xwayland-23.2.2.ebuild 2376 BLAKE2B dc483c3a7ed102a16ab669c70a7840accac2b0f6b757cea0ebb0ff36afec56e01ad4a1e967c8ef5588841b792ef805d8930f37e4705e664f50377329ee1cca7e SHA512 073af289523b7e6345fb787c1827ba87084e1201012af8b927240b460540cc129d4edafaef9b742986716a3cba039f2a4d216c27779b87632d8bdea19c6dc506 EBUILD xwayland-9999.ebuild 2443 BLAKE2B ee5fa283c6cbfeee7f7d33f4ed67679da6906fc20844174d85bcf9fdc6cbefa93c6bcbd7540eac3b496c0eefd8ae90879a8159515b23fd7eff2769a6c5a261b6 SHA512 85e045ff59e981b6d0369f729684b90e6ce06b1b6f1e729fb94993fc1579474d466820d3fca2c0570937ef5af343ca065e54ae78e6d2a94a98acf2585ae5b329 MISC metadata.xml 627 BLAKE2B 1d39badd8534a02eb9785acbfa9efa97823c134696d41397d1db294fa774da9b4f184e027dada1b718cff3d651c9b436a4812458abef1d70af4d7749963d822a SHA512 9d02c7a263144ecfa9aac594867efee3622823b264fc3305e11c4b396156f0c43b071804f6f0ae9850b67b09ae887d270a722b9c4c4482e5ea962eedb915ee79 diff --git a/x11-base/xwayland/xwayland-23.2.2.ebuild b/x11-base/xwayland/xwayland-23.2.2.ebuild new file mode 100644 index 000000000000..56309b0f665b --- /dev/null +++ b/x11-base/xwayland/xwayland-23.2.2.ebuild @@ -0,0 +1,110 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" + inherit git-r3 +else + SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Standalone X server running under Wayland" +HOMEPAGE="https://wayland.freedesktop.org/xserver.html" + +IUSE="libei selinux video_cards_nvidia unwind xcsecurity" + +LICENSE="MIT" +SLOT="0" + +COMMON_DEPEND=" + dev-libs/libbsd + dev-libs/openssl:= + >=dev-libs/wayland-1.21.0 + >=dev-libs/wayland-protocols-1.30 + media-fonts/font-util + >=media-libs/libepoxy-1.5.4[X,egl(+)] + media-libs/libglvnd[X] + >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] + >=x11-libs/libdrm-2.4.109 + >=x11-libs/libXau-1.0.4 + x11-libs/libxcvt + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont2-2.0.1 + x11-libs/libxkbfile + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-misc/xkeyboard-config-2.4.1-r3 + + libei? ( dev-libs/libei ) + unwind? ( sys-libs/libunwind ) + video_cards_nvidia? ( gui-libs/egl-wayland ) +" +DEPEND=" + ${COMMON_DEPEND} + >=x11-base/xorg-proto-2022.2 + >=x11-libs/xtrans-1.3.5 +" +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + !<=x11-base/xorg-server-1.20.11 + + libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 ) + selinux? ( sec-policy/selinux-xserver ) +" +BDEPEND=" + sys-devel/flex + dev-util/wayland-scanner +" + +PATCHES=( + "${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch +) + +src_configure() { + local emesonargs=( + $(meson_use selinux xselinux) + $(meson_use unwind libunwind) + $(meson_use xcsecurity) + $(meson_use video_cards_nvidia xwayland_eglstream) + -Ddpms=true + -Ddri3=true + -Ddrm=true + -Ddtrace=false + -Dglamor=true + -Dglx=true + -Dipv6=true + -Dsecure-rpc=false + -Dscreensaver=true + -Dsha1=libcrypto + -Dxace=true + -Dxdmcp=true + -Dxinerama=true + -Dxvfb=true + -Dxv=true + -Dxwayland-path="${EPREFIX}"/usr/bin + -Dlibdecor=false + -Ddocs=false + -Ddevel-docs=false + -Ddocs-pdf=false + ) + + if use libei; then + emesonargs+=( -Dxwayland_ei=portal ) + else + emesonargs+=( -Dxwayland_ei=false ) + fi + + meson_src_configure +} + +src_install() { + dosym ../bin/Xwayland /usr/libexec/Xwayland + + meson_src_install +} -- cgit v1.2.3