commit: 7d2273a9e780199b7a28bd06d17234130bc469e5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 7 22:37:03 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 7 22:44:05 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d2273a9
x11-wm/mutter: depend on media-libs/libdisplay-info unconditionally
While it's an optional dep in 46.x, it's mandatory in upstream master,
and it was automagic before this commit. Just require it.
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-wm/mutter/{mutter-46.4.ebuild => mutter-46.4-r1.ebuild} | 3 ++-
x11-wm/mutter/{mutter-46.7.ebuild => mutter-46.7-r1.ebuild} | 3 ++-
x11-wm/mutter/mutter-9999.ebuild | 7 ++++---
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/x11-wm/mutter/mutter-46.4.ebuild
b/x11-wm/mutter/mutter-46.4-r1.ebuild
similarity index 99%
rename from x11-wm/mutter/mutter-46.4.ebuild
rename to x11-wm/mutter/mutter-46.4-r1.ebuild
index 69fca7491985..5987f69cd1b6 100644
--- a/x11-wm/mutter/mutter-46.4.ebuild
+++ b/x11-wm/mutter/mutter-46.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -52,6 +52,7 @@ DEPEND="
>=media-libs/lcms-2.6:2
>=media-libs/harfbuzz-2.6.0:=
>=dev-libs/libei-1.0.901
+ media-libs/libdisplay-info:=
gnome? ( gnome-base/gnome-desktop:4= )
diff --git a/x11-wm/mutter/mutter-46.7.ebuild
b/x11-wm/mutter/mutter-46.7-r1.ebuild
similarity index 99%
rename from x11-wm/mutter/mutter-46.7.ebuild
rename to x11-wm/mutter/mutter-46.7-r1.ebuild
index 6136cb52f942..5930d24a87d8 100644
--- a/x11-wm/mutter/mutter-46.7.ebuild
+++ b/x11-wm/mutter/mutter-46.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -52,6 +52,7 @@ DEPEND="
>=media-libs/lcms-2.6:2
>=media-libs/harfbuzz-2.6.0:=
>=dev-libs/libei-1.0.901
+ media-libs/libdisplay-info:=
gnome? ( gnome-base/gnome-desktop:4= )
diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index 69fca7491985..5930d24a87d8 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
SRC_URI=""
SLOT="0/14" # This can get easily out of date, but better than 9967
else
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY
gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the
subslot
fi
@@ -52,6 +52,7 @@ DEPEND="
>=media-libs/lcms-2.6:2
>=media-libs/harfbuzz-2.6.0:=
>=dev-libs/libei-1.0.901
+ media-libs/libdisplay-info:=
gnome? ( gnome-base/gnome-desktop:4= )
@@ -73,7 +74,7 @@ DEPEND="
)
udev? (
>=virtual/libudev-232-r1:=
- >=dev-libs/libgudev-232
+ >=dev-libs/libgudev-238
)
systemd? ( sys-apps/systemd )
x11-libs/libSM
