diff options
Diffstat (limited to 'x11-base/xorg-server')
| -rw-r--r-- | x11-base/xorg-server/Manifest | 2 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-21.1.4-r100.ebuild (renamed from x11-base/xorg-server/xorg-server-21.1.3-r100.ebuild) | 33 |
2 files changed, 20 insertions, 15 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 1d987c68..253c3b83 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1 +1 @@ -DIST xorg-server-21.1.3.tar.xz 4955948 BLAKE2B 1907007e4131378ead2b8757e84e8e9403148c9b3cdffc68d7c54faf5ab0efa6b594b635940fce8af4b8334e4a1c67984f59fc2f3642e48b54eb2f2dcc7fd8f5 SHA512 cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b +DIST xorg-server-21.1.4.tar.xz 4940176 BLAKE2B 8f68c7de102f7f8d0f56566a518025bb32c079184d5a5556dc8e651111b6a018669102b18ec2e9470d3ab91f51291618f9c49281915d885fc30446e1b54d2134 SHA512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f diff --git a/x11-base/xorg-server/xorg-server-21.1.3-r100.ebuild b/x11-base/xorg-server/xorg-server-21.1.4-r100.ebuild index 71b9d8d0..bc871a95 100644 --- a/x11-base/xorg-server/xorg-server-21.1.3-r100.ebuild +++ b/x11-base/xorg-server/xorg-server-21.1.4-r100.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 XORG_TARBALL_SUFFIX="xz" XORG_EAUTORECONF="no" @@ -11,7 +11,7 @@ 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" + 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" @@ -31,14 +31,18 @@ CDEPEND=" >=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 + 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[xkb] x11-libs/xcb-util @@ -48,14 +52,15 @@ CDEPEND=" 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 ) + unwind? ( sys-libs/libunwind:= ) + selinux? ( + sys-process/audit + sys-libs/libselinux:= + ) systemd? ( sys-apps/dbus sys-apps/systemd @@ -65,11 +70,13 @@ CDEPEND=" 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 ) @@ -88,9 +95,6 @@ REQUIRED_USE="!minimal? ( elogind? ( udev ) ?? ( elogind systemd )" -UPSTREAMED_PATCHES=( -) - PATCHES=( "${UPSTREAMED_PATCHES[@]}" "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch @@ -117,6 +121,7 @@ src_configure() { $(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) @@ -157,7 +162,7 @@ src_install() { meson_src_install # The meson build system does not support install-setuid - if ! use systemd || ! use elogind; then + if ! use systemd && ! use elogind; then if use suid; then chmod u+s "${ED}"/usr/bin/Xorg fi |