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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CC8FD158086 for ; Mon, 1 Nov 2021 19:32:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F121EE0788; Mon, 1 Nov 2021 19:32:24 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F549E0788 for ; Mon, 1 Nov 2021 19:32:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12965342E70 for ; Mon, 1 Nov 2021 19:32:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 743EBDC for ; Mon, 1 Nov 2021 19:32:19 +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: <1635795134.f30f6ccddc4c4feffa3d40d8f5353d355df7bb2e.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: f30f6ccddc4c4feffa3d40d8f5353d355df7bb2e X-VCS-Branch: master Date: Mon, 1 Nov 2021 19:32:19 +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: 955c20ca-de3c-4015-8976-fef79e7ac0f8 X-Archives-Hash: 4abb8278de16a1bf7624cdbbed8dd8b2 commit: f30f6ccddc4c4feffa3d40d8f5353d355df7bb2e Author: Piotr Karbowski gentoo org> AuthorDate: Mon Nov 1 19:28:54 2021 +0000 Commit: Piotr Karbowski gentoo org> CommitDate: Mon Nov 1 19:32:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30f6ccd x11-base/xorg-server: switch from autotools to meson in live ebuild. The meson integration is a bit wonky, we need to get the things into eclass ideally, as we move forward, maybe xorg-4 that has no autotools logic? kdrive is no more interfaced via configuration options, so dropping it from IUSE. Tested both with live ebuild as well as x11-base/xorg-server-1.20.13, works just fine (minus the libxcvt bit, of course) X symlink is no longer created so we create it now outside meson install. List of installes files metch minus example xfree86 config and cvt. Closes: https://bugs.gentoo.org/820845 Signed-off-by: Piotr Karbowski gentoo.org> x11-base/xorg-server/xorg-server-9999.ebuild | 112 +++++++++++---------------- 1 file changed, 47 insertions(+), 65 deletions(-) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 428f4355da4..27d63ee09fb 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -5,8 +5,9 @@ EAPI=7 XORG_DOC=doc XORG_TARBALL_SUFFIX="xz" -inherit xorg-3 multilib flag-o-matic toolchain-funcs +inherit xorg-3 meson EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" +XORG_EAUTORECONF="no" DESCRIPTION="X.Org X servers" SLOT="0/${PV}" @@ -14,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi -IUSE_SERVERS="kdrive xephyr xnest xorg xvfb" +IUSE_SERVERS="xephyr xnest xorg xvfb" IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" RESTRICT="!test? ( test )" @@ -36,10 +37,8 @@ CDEPEND=" >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 - kdrive? ( - >=x11-libs/libXext-1.0.5 - x11-libs/libXv - ) + >=x11-libs/libXext-1.0.5 + x11-libs/libXv xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util @@ -86,8 +85,7 @@ REQUIRED_USE="!minimal? ( || ( ${IUSE_SERVERS} ) ) elogind? ( udev ) - ?? ( elogind systemd ) - xephyr? ( kdrive )" + ?? ( elogind systemd )" UPSTREAMED_PATCHES=( ) @@ -105,83 +103,67 @@ src_configure() { # 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 XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable debug) - $(use_enable kdrive) - $(use_enable test unit-tests) - $(use_enable unwind libunwind) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal dri3) - $(use_enable !minimal glamor) - $(use_enable !minimal glx) - $(use_enable xcsecurity) - $(use_enable xephyr) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - $(use_with systemd systemd-daemon) - --disable-xwayland - --enable-libdrm - --sysconfdir="${EPREFIX}"/etc/X11 - --localstatedir="${EPREFIX}"/var - --with-fontrootdir="${EPREFIX}"/usr/share/fonts - --with-xkb-output="${EPREFIX}"/var/lib/xkb - --disable-config-hal - --disable-linux-acpi - --without-dtrace - --without-fop - --with-sha1=libcrypto - CPP="$(tc-getPROG CPP cpp)" + + local emesonargs=( + --localstatedir "${EPREFIX}/var" + --sysconfdir "${EPREFIX}/etc/X11" + $(meson_use ipv6) + $(meson_use debug) + $(meson_use unwind libunwind) + $(meson_use !minimal dri) + $(meson_use !minimal dri2) + $(meson_use !minimal dri3) + $(meson_use !minimal glx) + $(meson_use !minimal glamor) + $(meson_use xcsecurity) + $(meson_use xephyr) + $(meson_use xnest) + $(meson_use xorg) + $(meson_use xvfb) + $(meson_use udev) + $(meson_use udev udev_kms) + $(meson_use doc docs) + -Ddrm=true + -Dxwayland=false + -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" + -Dhal=false + -Dlinux_acpi=false + -Ddtrace=false + -Dsha1=libcrypto + -Ddefault_font_path="${EPREFIX}"/usr/share/fonts ) if use systemd || use elogind; then - XORG_CONFIGURE_OPTIONS+=( - --enable-systemd-logind - --disable-install-setuid - $(use_enable suid suid-wrapper) + emesonargs+=( + -Dsystemd_logind=true + $(meson_use suid suid_wrapper) ) else - XORG_CONFIGURE_OPTIONS+=( - --disable-systemd-logind - --disable-suid-wrapper - $(use_enable suid install-setuid) + emesonargs+=( + -Dsystemd_logind=false + $(meson_use suid suid_wrapper) ) fi - xorg-3_src_configure + meson_src_configure } -server_based_install() { +src_install() { + meson_src_install + + #The new meson build system do not leave X symlink + ln -s Xorg "${ED}"/usr/bin/X + 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 -} - -src_install() { - xorg-3_src_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${S}"/hw/xfree86/xorg.conf.example - fi # install the @x11-module-rebuild set for Portage insinto /usr/share/portage/config/sets newins "${FILESDIR}"/xorg-sets.conf xorg.conf - - find "${ED}"/var -type d -empty -delete || die } pkg_postrm() {