From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BAB3513933E for ; Sat, 3 Jul 2021 20:07:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECDC3E0855; Sat, 3 Jul 2021 20:07:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D09BAE0855 for ; Sat, 3 Jul 2021 20:07:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D57B8342AF9 for ; Sat, 3 Jul 2021 20:07:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 465097C1 for ; Sat, 3 Jul 2021 20:07:15 +0000 (UTC) From: "Piotr Karbowski" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Piotr Karbowski" Message-ID: <1625342833.44466a67e2532ce119ee308b98c426b580857c89.slashbeast@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xorg-server/xorg-server-9999.ebuild X-VCS-Directories: x11-base/xorg-server/ X-VCS-Committer: slashbeast X-VCS-Committer-Name: Piotr Karbowski X-VCS-Revision: 44466a67e2532ce119ee308b98c426b580857c89 X-VCS-Branch: master Date: Sat, 3 Jul 2021 20:07:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e0ef628b-1062-4519-bf4f-dea89e876444 X-Archives-Hash: 2552d2e8b719962fe4c93e3577c54863 commit: 44466a67e2532ce119ee308b98c426b580857c89 Author: Piotr Karbowski gentoo org> AuthorDate: Sat Jul 3 20:06:11 2021 +0000 Commit: Piotr Karbowski gentoo org> CommitDate: Sat Jul 3 20:07:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44466a67 x11-base/xorg-server: align 9999 ebuild with xwayland split. Signed-off-by: Piotr Karbowski gentoo.org> x11-base/xorg-server/xorg-server-9999.ebuild | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 1b2a33ee908..70fb5f6bd29 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -68,11 +68,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 - ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus @@ -97,6 +92,7 @@ DEPEND="${CDEPEND} ) ) ) + wayland? ( x11-base/xwayland ) " RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) @@ -104,7 +100,6 @@ RDEPEND="${CDEPEND} " BDEPEND=" sys-devel/flex - wayland? ( dev-util/wayland-scanner ) " PDEPEND=" xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" @@ -127,14 +122,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 @@ -148,7 +135,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) @@ -165,6 +151,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 @@ -174,6 +161,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop + --with-os-vendor=Gentoo --with-sha1=libcrypto CPP="$(tc-getPROG CPP cpp)" )