diff options
Diffstat (limited to 'x11-base/xorg-server')
| -rw-r--r-- | x11-base/xorg-server/Manifest | 1 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.20.11-r2.ebuild (renamed from x11-base/xorg-server/xorg-server-1.20.11-r1.ebuild) | 19 |
2 files changed, 3 insertions, 17 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index be796cb..fad1256 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,2 +1 @@ -DIST xorg-server-1.20.10.tar.bz2 6307058 BLAKE2B 13306e5f4f7f2b4531f2af5103337defa1d441bff78f20ea4d564a7d046ee546406812b6836fe94ca9323189382754270989b2ac7ded8950ddb2b15562c6ff21 SHA512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae DIST xorg-server-1.20.11.tar.bz2 6476116 BLAKE2B 71ec31c4ed050a3e27fadd525f1039895e43571c04b0a1efa9b35fda318f17b3c89d403c914c591345e7d245a7ebbd6e0f206e4415c1d54f1368fb0735a3d7ef SHA512 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2 diff --git a/x11-base/xorg-server/xorg-server-1.20.11-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.11-r2.ebuild index be31e68..7960e09 100644 --- a/x11-base/xorg-server/xorg-server-1.20.11-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.11-r2.ebuild @@ -10,7 +10,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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" @@ -66,11 +66,6 @@ CDEPEND=" ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - >=media-libs/libepoxy-1.5.4[egl(+)] - >=dev-libs/wayland-protocols-1.18 - ) systemd? ( sys-apps/dbus sys-apps/systemd @@ -94,6 +89,7 @@ DEPEND="${CDEPEND} ) ) ) + wayland? ( x11-base/xwayland ) " RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) @@ -101,7 +97,6 @@ RDEPEND="${CDEPEND} " BDEPEND=" sys-devel/flex - wayland? ( dev-util/wayland-scanner ) " PDEPEND=" xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" @@ -124,14 +119,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch ) -pkg_setup() { - if use wayland && use minimal; then - ewarn "glamor is necessary for acceleration under Xwayland." - ewarn "Performance may be unacceptable without it." - ewarn "Build with USE=-minimal to enable glamor." - fi -} - src_configure() { # localstatedir is used for the log location; we need to override the default # from ebuild.sh @@ -145,7 +132,6 @@ src_configure() { $(use_enable kdrive) $(use_enable test unit-tests) $(use_enable unwind libunwind) - $(use_enable wayland xwayland) $(use_enable !minimal record) $(use_enable !minimal xfree86-utils) $(use_enable !minimal dri) @@ -162,6 +148,7 @@ src_configure() { $(use_with doc doxygen) $(use_with doc xmlto) $(use_with systemd systemd-daemon) + --disable-xwayland --enable-libdrm --sysconfdir="${EPREFIX}"/etc/X11 --localstatedir="${EPREFIX}"/var |