public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matthew Thode" <prometheanfire@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/
Date: Sun, 21 May 2023 19:58:52 +0000 (UTC)	[thread overview]
Message-ID: <1684699127.3807e953a8eec7d5e64b2397b903400d98c9e21b.prometheanfire@gentoo> (raw)

commit:     3807e953a8eec7d5e64b2397b903400d98c9e21b
Author:     Zurab Kvachadze <zurabid2016 <AT> gmail <DOT> com>
AuthorDate: Thu May 18 07:51:48 2023 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun May 21 19:58:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3807e953

gui-libs/wlroots: fix building with seatd, revbump to wlroots-0.16.2-r1

Previous ebuild would conditionally, based on the USE flags, pull
mandatory dependencies (that is udev, hwdata, seatd), which in the
absense of such would result in a build failure. USE flags have been
removed, which does not affect users who managed to build the package
successfully, therefore keywords were not dropped.

It is possible to disable/enable certain backends including their
dependencies, so ability to control this behaviour was added in 0.16.1-r1
and 9999 versions.

Bug: https://bugs.gentoo.org/883781
Closes: https://bugs.gentoo.org/883781
Signed-off-by: Zurab Kvachadze <zurabid2016 <AT> gmail.com>
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 gui-libs/wlroots/metadata.xml                      |  7 +++--
 ...oots-0.16.2.ebuild => wlroots-0.16.2-r1.ebuild} | 19 ++++++++-----
 gui-libs/wlroots/wlroots-0.16.2.ebuild             |  8 +++---
 gui-libs/wlroots/wlroots-9999.ebuild               | 33 +++++++++++++---------
 4 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/gui-libs/wlroots/metadata.xml b/gui-libs/wlroots/metadata.xml
index 69cb7d4fc088..10ac1444ba24 100644
--- a/gui-libs/wlroots/metadata.xml
+++ b/gui-libs/wlroots/metadata.xml
@@ -21,9 +21,10 @@
 		wlroots is developed under the direction of the <pkg>gui-wm/sway</pkg> project.
 	</longdescription>
 	<use>
-		<flag name="hwdata">Use system hwdata</flag>
-		<flag name="liftoff">Enable support for libliftoff kms plane backend</flag>
-		<flag name="seatd">Enable libseatd session support</flag>
+		<flag name="drm">Enable Direct Rendering Management</flag>
+		<flag name="liftoff">Enable support for libliftoff KMS plane backend</flag>
+		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
+		<flag name="session">Enable session support (is required for DRM and libinput)</flag>
 		<flag name="tinywl">Install the minimal wayland client, tinywl</flag>
 		<flag name="vulkan">Enable support for the vulkan backend renderer</flag>
 		<flag name="x11-backend">Enable support for handling input/output devices through <pkg>x11-libs/libxcb</pkg></flag>

diff --git a/gui-libs/wlroots/wlroots-0.16.2.ebuild b/gui-libs/wlroots/wlroots-0.16.2-r1.ebuild
similarity index 79%
copy from gui-libs/wlroots/wlroots-0.16.2.ebuild
copy to gui-libs/wlroots/wlroots-0.16.2-r1.ebuild
index c6aa61b39f4b..f1999ee681bf 100644
--- a/gui-libs/wlroots/wlroots-0.16.2.ebuild
+++ b/gui-libs/wlroots/wlroots-0.16.2-r1.ebuild
@@ -14,21 +14,21 @@ if [[ ${PV} == 9999 ]]; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 	SLOT="0/$(ver_cut 2)"
 fi
 
 LICENSE="MIT"
-IUSE="+hwdata +seatd tinywl +udev vulkan x11-backend X"
+IUSE="+drm +libinput tinywl vulkan x11-backend X"
 
 DEPEND="
-	>=dev-libs/libinput-1.14.0:0=
 	>=dev-libs/wayland-1.21.0
 	>=dev-libs/wayland-protocols-1.28
+	drm? ( sys-apps/hwdata:= )
+	libinput? ( >=dev-libs/libinput-1.14.0:0= )
 	media-libs/mesa[egl(+),gles2]
-	hwdata? ( sys-apps/hwdata:= )
-	seatd? ( sys-auth/seatd:= )
-	udev? ( virtual/libudev )
+	sys-auth/seatd:=
+	virtual/libudev
 	vulkan? (
 		dev-util/glslang:0=
 		dev-util/vulkan-headers:0=
@@ -57,13 +57,18 @@ BDEPEND="
 "
 
 src_configure() {
+	local backends="$(usex drm 'drm,' '')"
+	backends+="$(usex libinput 'libinput,' '')"
+	backends+="$(usex x11-backend 'x11,' '')"
+	# Get rid of a trailing comma
+	backends="${backends%,}"
 	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
 	local emesonargs=(
 		"-Dxcb-errors=disabled"
 		$(meson_use tinywl examples)
 		-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
 		-Dxwayland=$(usex X enabled disabled)
-		-Dbackends=drm,libinput$(usex x11-backend ',x11' '')
+		-Dbackends="${backends}"
 	)
 
 	meson_src_configure

diff --git a/gui-libs/wlroots/wlroots-0.16.2.ebuild b/gui-libs/wlroots/wlroots-0.16.2.ebuild
index c6aa61b39f4b..0e57c5f6342e 100644
--- a/gui-libs/wlroots/wlroots-0.16.2.ebuild
+++ b/gui-libs/wlroots/wlroots-0.16.2.ebuild
@@ -19,16 +19,16 @@ else
 fi
 
 LICENSE="MIT"
-IUSE="+hwdata +seatd tinywl +udev vulkan x11-backend X"
+IUSE="tinywl vulkan x11-backend X"
 
 DEPEND="
 	>=dev-libs/libinput-1.14.0:0=
 	>=dev-libs/wayland-1.21.0
 	>=dev-libs/wayland-protocols-1.28
 	media-libs/mesa[egl(+),gles2]
-	hwdata? ( sys-apps/hwdata:= )
-	seatd? ( sys-auth/seatd:= )
-	udev? ( virtual/libudev )
+	sys-apps/hwdata:=
+	sys-auth/seatd:=
+	virtual/libudev
 	vulkan? (
 		dev-util/glslang:0=
 		dev-util/vulkan-headers:0=

diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index ec3331b0dc80..23e9b35403bd 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -19,18 +19,23 @@ else
 fi
 
 LICENSE="MIT"
-IUSE="+hwdata liftoff +seatd tinywl +udev vulkan x11-backend xcb-errors X"
+IUSE="liftoff +libinput +drm +session tinywl vulkan x11-backend xcb-errors X"
+REQUIRED_USE="drm? ( session ) libinput? ( session )"
 
 DEPEND="
-	>=dev-libs/libinput-1.14.0:0=
 	>=dev-libs/wayland-1.22.0
 	>=dev-libs/wayland-protocols-1.28
+	drm? (
+		liftoff? ( dev-libs/libliftoff )
+		media-libs/libdisplay-info
+		sys-apps/hwdata:=
+	)
+	libinput? ( >=dev-libs/libinput-1.14.0:0= )
 	media-libs/mesa[egl(+),gles2]
-	media-libs/libdisplay-info
-	hwdata? ( sys-apps/hwdata:= )
-	liftoff? ( dev-libs/libliftoff )
-	seatd? ( sys-auth/seatd:= )
-	udev? ( virtual/libudev )
+	session? (
+		sys-auth/seatd:=
+		virtual/libudev
+	)
 	vulkan? (
 		dev-util/glslang:0=
 		dev-util/vulkan-headers:0=
@@ -60,20 +65,20 @@ BDEPEND="
 "
 
 src_configure() {
+	local backends="$(usex drm 'drm,' '')"
+	backends+="$(usex libinput 'libinput,' '')"
+	backends+="$(usex x11-backend 'x11,' '')"
+	# Get rid of a trailing comma
+	backends="${backends%,}"
 	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
 	local emesonargs=(
-		"-Dxcb-errors=disabled"
 		-Dxcb-errors=$(usex xcb-errors enabled disabled)
 		$(meson_use tinywl examples)
 		-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
 		-Dxwayland=$(usex X enabled disabled)
-		-Dbackends=drm,libinput$(usex x11-backend ',x11' '')
+		-Dbackends="${backends}"
+		-Dsession=$(usex session enabled disabled)
 	)
-	if use udev; then
-		emesonargs+=(-Dsession=$(usex seatd enabled disabled))
-	else
-		emesonargs+=(-Dsession=disabled)
-	fi
 
 	meson_src_configure
 }


             reply	other threads:[~2023-05-21 19:58 UTC|newest]

Thread overview: 189+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-21 19:58 Matthew Thode [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-24  7:34 [gentoo-commits] repo/gentoo:master commit in: gui-libs/wlroots/ Arthur Zamarin
2024-10-24  1:03 Sam James
2024-10-24  1:03 Sam James
2024-10-23 22:27 Sam James
2024-09-20 20:28 Arthur Zamarin
2024-08-31  5:02 Sam James
2024-08-31  5:02 Sam James
2024-08-30  9:05 Arthur Zamarin
2024-08-30  6:45 Arthur Zamarin
2024-08-16 10:50 Arthur Zamarin
2024-08-16  7:54 Arthur Zamarin
2024-08-16  7:28 Arthur Zamarin
2024-07-29 23:05 Sam James
2024-07-29 23:05 Sam James
2024-07-29 23:05 Sam James
2024-07-29 23:05 Sam James
2024-07-13 19:18 Arthur Zamarin
2024-07-13 19:18 Arthur Zamarin
2024-07-13 18:14 Arthur Zamarin
2024-07-13 18:14 Arthur Zamarin
2024-07-13  6:02 Arthur Zamarin
2024-07-13  6:02 Arthur Zamarin
2024-07-11 10:54 Arthur Zamarin
2024-06-30 15:05 James Le Cuirot
2024-06-27 20:24 Arthur Zamarin
2024-06-25 22:04 Sam James
2024-06-25 22:03 Sam James
2024-06-25 22:03 Sam James
2024-06-25 22:03 Sam James
2024-06-11  5:56 Arthur Zamarin
2024-06-11  5:56 Arthur Zamarin
2024-06-04 18:31 Arthur Zamarin
2024-05-28  2:11 Sam James
2024-05-23 16:10 Matt Turner
2024-04-28 14:07 Arthur Zamarin
2024-04-28 14:07 Arthur Zamarin
2024-04-13  7:24 Arthur Zamarin
2024-04-13  7:13 Arthur Zamarin
2024-04-13  6:41 Arthur Zamarin
2024-04-13  6:39 Arthur Zamarin
2024-04-13  6:37 Arthur Zamarin
2024-03-12  6:34 Arthur Zamarin
2024-03-12  6:34 Arthur Zamarin
2024-03-08 11:33 Arthur Zamarin
2024-02-09  2:21 Sam James
2024-02-09  1:04 Sam James
2024-02-09  1:04 Sam James
2024-02-09  1:04 Sam James
2024-01-28 17:34 Matt Turner
2024-01-23  5:07 Ionen Wolkens
2024-01-04 10:02 Sam James
2024-01-04 10:02 Sam James
2024-01-03 21:34 Sam James
2024-01-03 19:07 Arthur Zamarin
2024-01-03 19:07 Arthur Zamarin
2023-12-05  7:53 Arthur Zamarin
2023-11-29  6:20 Sam James
2023-11-25  6:12 Sam James
2023-11-05 14:48 Sam James
2023-11-05 13:50 Sam James
2023-11-05 13:38 Sam James
2023-10-05 16:02 Arthur Zamarin
2023-09-28 17:52 Arthur Zamarin
2023-09-28 17:51 Arthur Zamarin
2023-09-28 17:51 Arthur Zamarin
2023-09-28 17:51 Arthur Zamarin
2023-09-28 17:51 Arthur Zamarin
2023-09-28 17:51 Arthur Zamarin
2023-09-28 17:51 Arthur Zamarin
2023-09-28 17:51 Arthur Zamarin
2023-09-28 17:51 Arthur Zamarin
2023-07-07 19:07 Arthur Zamarin
2023-07-07 19:07 Arthur Zamarin
2023-07-07 19:07 Arthur Zamarin
2023-05-23  2:52 Sam James
2023-05-21 20:04 Matthew Thode
2023-05-21 20:02 Matthew Thode
2023-05-13 17:06 Matthew Thode
2023-05-13 16:59 Matthew Thode
2023-04-20 18:28 Arthur Zamarin
2023-04-13  1:36 Matthew Thode
2023-03-24 14:45 Matthew Thode
2023-03-12 22:29 Matthew Thode
2023-03-07  7:57 Sam James
2023-02-25 18:09 Matthew Thode
2023-02-25 17:45 Matthew Thode
2023-02-25  5:46 Arthur Zamarin
2023-02-13  3:31 Matthew Thode
2023-01-25 20:46 Matthew Thode
2022-12-25 18:51 Matthew Thode
2022-11-27 17:46 Matthew Thode
2022-11-27 17:46 Matthew Thode
2022-11-27 17:46 Matthew Thode
2022-11-12  7:21 Sam James
2022-11-11 20:28 Matthew Thode
2022-10-17 18:42 Arthur Zamarin
2022-10-03 13:27 Joonas Niilola
2022-08-17 20:42 Matthew Thode
2022-08-17  4:53 Arthur Zamarin
2022-08-16 19:43 Sam James
2022-08-16 19:43 Sam James
2022-08-16 18:08 Arthur Zamarin
2022-08-14 19:24 Arthur Zamarin
2022-08-14  6:50 Joonas Niilola
2022-07-24  5:00 Matthew Thode
2022-05-26  5:39 WANG Xuerui
2022-05-26  5:39 WANG Xuerui
2022-05-17  5:59 Sam James
2022-02-26  2:43 Sam James
2022-02-26  2:43 Sam James
2022-02-22 19:47 Matthew Thode
2022-01-01 10:03 Sam James
2021-12-26  1:23 Matthew Thode
2021-12-25  4:31 Matthew Thode
2021-12-13  5:41 Matthew Thode
2021-11-18 23:15 Matthew Thode
2021-11-01  1:55 Matthew Thode
2021-11-01  1:49 Matthew Thode
2021-11-01  1:33 Matthew Thode
2021-11-01  1:26 Matthew Thode
2021-10-31  0:19 Sam James
2021-10-30 23:33 Sam James
2021-10-30 23:33 Sam James
2021-10-11 15:24 Matthew Thode
2021-09-20  0:42 Matthew Thode
2021-09-19 20:11 Matthew Thode
2021-08-25  2:21 Aaron Bauman
2021-08-20  0:28 Sam James
2021-08-18  1:28 Sam James
2021-08-18  1:28 Sam James
2021-07-26 19:51 Piotr Karbowski
2021-07-24 20:26 Matthew Thode
2021-07-21  2:22 Yixun Lan
2021-06-26 20:52 Matthew Thode
2021-06-25 16:03 Matthew Thode
2021-06-09 18:13 Matthew Thode
2021-05-09 18:00 Matthew Thode
2021-04-19 20:40 Matthew Thode
2021-04-19 20:38 Matthew Thode
2021-04-19 20:38 Matthew Thode
2021-04-08 15:37 Matthew Thode
2021-02-21  2:32 Matthew Thode
2021-02-14 19:38 Matthew Thode
2020-12-11 18:02 Matthew Thode
2020-11-11 17:24 Aaron Bauman
2020-11-11 17:03 Aaron Bauman
2020-11-10 18:26 Aaron Bauman
2020-11-09 16:38 Aaron Bauman
2020-11-09 15:30 Aaron Bauman
2020-11-09 14:56 Aaron Bauman
2020-11-09 14:56 Aaron Bauman
2020-09-15 16:57 Matthew Thode
2020-09-15 16:29 Matthew Thode
2020-07-25 19:33 Sam James
2020-07-25 11:16 Sam James
2020-07-24 16:29 Aaron Bauman
2020-07-16 14:50 Matthew Thode
2020-05-16  2:49 Matthew Thode
2020-04-24  1:33 Matthew Thode
2020-04-19 15:51 Aaron Bauman
2020-02-22 21:39 Matthew Thode
2020-02-22 21:39 Matthew Thode
2020-01-24  4:19 Georgy Yakovlev
2020-01-24  4:19 Georgy Yakovlev
2020-01-22 22:20 Matthew Thode
2020-01-22 22:20 Matthew Thode
2020-01-11 20:02 Matthew Thode
2019-11-13  3:48 Aaron Bauman
2019-11-13  3:48 Aaron Bauman
2019-11-08  3:29 Aaron Bauman
2019-11-08  2:14 Aaron Bauman
2019-11-04  3:17 Aaron Bauman
2019-09-27 18:12 Matthew Thode
2019-09-27 18:12 Matthew Thode
2019-08-28 19:08 Matthew Thode
2019-08-28 17:37 Matthew Thode
2019-08-01 15:26 Aaron Bauman
2019-06-02 17:22 Matthew Thode
2019-05-29 20:45 Aaron Bauman
2019-05-03 18:33 Matthew Thode
2019-05-03 18:33 Matthew Thode
2019-04-24 23:11 Thomas Deutschmann
2019-04-10  5:03 Aaron Bauman
2019-04-10  3:01 Aaron Bauman
2019-03-12 13:49 Matthew Thode
2019-03-04 21:35 Matthew Thode
2019-02-26  1:04 Matthew Thode
2019-02-22 22:54 Aaron Bauman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1684699127.3807e953a8eec7d5e64b2397b903400d98c9e21b.prometheanfire@gentoo \
    --to=prometheanfire@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox