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 EFD981382C5 for ; Mon, 19 Apr 2021 20:38:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05142E0817; Mon, 19 Apr 2021 20:38:42 +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 DD589E0817 for ; Mon, 19 Apr 2021 20:38:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 AA34E340E43 for ; Mon, 19 Apr 2021 20:38:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3407A59C for ; Mon, 19 Apr 2021 20:38:39 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1618864714.ef3dfe71841c72d6d5833fffce9c54c57977268a.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-libs/wlroots/wlroots-0.13.0.ebuild gui-libs/wlroots/wlroots-9999.ebuild X-VCS-Directories: gui-libs/wlroots/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: ef3dfe71841c72d6d5833fffce9c54c57977268a X-VCS-Branch: master Date: Mon, 19 Apr 2021 20:38:39 +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: 06eb890b-fdf6-47a2-ba2b-b83ec527d9e4 X-Archives-Hash: ceab7cef6fb52b10c7773374477fc9c4 commit: ef3dfe71841c72d6d5833fffce9c54c57977268a Author: Aisha Tammy bsd ac> AuthorDate: Mon Apr 19 20:32:44 2021 +0000 Commit: Matthew Thode gentoo org> CommitDate: Mon Apr 19 20:38:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3dfe71 gui-libs/wlroots: fix slot and live ebuild Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Aisha Tammy aisha.cc> Signed-off-by: Matthew Thode gentoo.org> gui-libs/wlroots/wlroots-0.13.0.ebuild | 2 +- gui-libs/wlroots/wlroots-9999.ebuild | 25 +++++++------------------ 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/gui-libs/wlroots/wlroots-0.13.0.ebuild b/gui-libs/wlroots/wlroots-0.13.0.ebuild index 1a25bccc084..f370f34a654 100644 --- a/gui-libs/wlroots/wlroots-0.13.0.ebuild +++ b/gui-libs/wlroots/wlroots-0.13.0.ebuild @@ -17,7 +17,7 @@ else fi LICENSE="MIT" -SLOT="0/9999" +SLOT="0/13" IUSE="elogind icccm seatd systemd x11-backend X" REQUIRED_USE="?? ( elogind systemd )" diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild index 1a25bccc084..9cf3f67c741 100644 --- a/gui-libs/wlroots/wlroots-9999.ebuild +++ b/gui-libs/wlroots/wlroots-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit fcaps meson +inherit meson DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor" HOMEPAGE="https://github.com/swaywm/wlroots" @@ -18,27 +18,24 @@ fi LICENSE="MIT" SLOT="0/9999" -IUSE="elogind icccm seatd systemd x11-backend X" -REQUIRED_USE="?? ( elogind systemd )" +IUSE="x11-backend X" DEPEND=" >=dev-libs/libinput-1.14.0:0= >=dev-libs/wayland-1.19.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] + sys-auth/seatd:= virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman - elogind? ( >=sys-auth/elogind-237 ) - icccm? ( x11-libs/xcb-util-wm ) - seatd? ( sys-auth/seatd:= ) - systemd? ( >=sys-apps/systemd-237 ) x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image + x11-libs/xcb-util-wm ) " RDEPEND=" @@ -54,20 +51,12 @@ src_configure() { # xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?) local emesonargs=( "-Dxcb-errors=disabled" - -Dxcb-icccm=$(usex icccm enabled disabled) - -Dxwayland=$(usex X enabled disabled) - -Dx11-backend=$(usex x11-backend enabled disabled) "-Dexamples=false" "-Dwerror=false" - -Dlibseat=$(usex seatd enabled disabled) + "-Drenderers=gles2" + -Dxwayland=$(usex X enabled disabled) + -Dx11-backend=$(usex x11-backend enabled disabled) ) - if use systemd; then - emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd") - elif use elogind; then - emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind") - else - emesonargs+=("-Dlogind=disabled") - fi meson_src_configure }