commit: 189111a2731e3123c256fdc118dadc3bb54c1c12
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 22 19:40:23 2025 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 20:42:30 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=189111a2
x11-wm/mutter: bind to subslot of libdisplay-info due to soname changes
The history of this package looks like a wikipedia revert war.
See commits:
0550d3f3349b6b91d052dc026927e7fe064d78d8:
add dep
0550d3f3349b6b91d052dc026927e7fe064d78d8:
new slot added in libdisplay-info, propagated as revdep to
mutter
Then:
0550d3f3349b6b91d052dc026927e7fe064d78d8:
removed from live
7d2273a9e780199b7a28bd06d17234130bc469e5:
added back in all ebuilds, automagic in stable ebuilds and no
upstream option in live, added unconditionally everywhere
b7d8012c1c67617398343973ae39179b3ecc3630:
PR was NOT rebased before merge, introduces dep but without
slotting. Dep is USE-conditional, which is understandable... (?)
c16e858718237269666db9f0415fc953397d8577:
"sync live ebuild". Removes a minimum version bound needed in
live, makes it USE-conditional even though there is no longer an
upstream option, drops slotting
I do not know how this is supposed to work. It will lead to crashing
desktops though, if subslot rebuilds do not happen (and especially if
restoring from a binary package built without subslot binding).
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
x11-wm/mutter/{mutter-47.4.ebuild => mutter-47.4-r1.ebuild} | 2 +-
x11-wm/mutter/{mutter-47.6.ebuild => mutter-47.6-r1.ebuild} | 2 +-
x11-wm/mutter/mutter-9999.ebuild | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/x11-wm/mutter/mutter-47.4.ebuild
b/x11-wm/mutter/mutter-47.4-r1.ebuild
similarity index 99%
rename from x11-wm/mutter/mutter-47.4.ebuild
rename to x11-wm/mutter/mutter-47.4-r1.ebuild
index f5d1d2344111..cc919bb1eac7 100644
--- a/x11-wm/mutter/mutter-47.4.ebuild
+++ b/x11-wm/mutter/mutter-47.4-r1.ebuild
@@ -83,7 +83,7 @@ RDEPEND="
>=x11-libs/startup-notification-0.7
screencast? ( >=media-video/pipewire-1.2.0:= )
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- libdisplay? ( media-libs/libdisplay-info )
+ libdisplay? ( media-libs/libdisplay-info:= )
test? (
>=x11-libs/gtk+-3.19.8:3[X,introspection?]
gnome-extra/zenity
diff --git a/x11-wm/mutter/mutter-47.6.ebuild
b/x11-wm/mutter/mutter-47.6-r1.ebuild
similarity index 99%
rename from x11-wm/mutter/mutter-47.6.ebuild
rename to x11-wm/mutter/mutter-47.6-r1.ebuild
index 7c95e3ddf2d6..165337768d1a 100644
--- a/x11-wm/mutter/mutter-47.6.ebuild
+++ b/x11-wm/mutter/mutter-47.6-r1.ebuild
@@ -82,7 +82,7 @@ RDEPEND="
>=x11-libs/startup-notification-0.7
screencast? ( >=media-video/pipewire-1.2.0:= )
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- libdisplay? ( media-libs/libdisplay-info )
+ libdisplay? ( media-libs/libdisplay-info:= )
test? (
>=x11-libs/gtk+-3.19.8:3[X,introspection?]
gnome-extra/zenity
diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index 67bbd11dda6f..1cd4d0425081 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -19,7 +19,7 @@ else
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
-IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection
+libdisplay screencast sysprof systemd test udev wayland X +xwayland
video_cards_nvidia"
+IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection
screencast sysprof systemd test udev wayland X +xwayland video_cards_nvidia"
# native backend requires gles3 for hybrid graphics blitting support, udev and
a logind provider
REQUIRED_USE="
|| ( X wayland )
@@ -53,6 +53,7 @@ RDEPEND="
>=media-libs/lcms-2.6:2
>=media-libs/harfbuzz-2.6.0:=
>=dev-libs/libei-1.0.901
+ >=media-libs/libdisplay-info-0.2:=
gnome? ( gnome-base/gnome-desktop:4= )
@@ -82,7 +83,6 @@ RDEPEND="
>=x11-libs/startup-notification-0.7
screencast? ( >=media-video/pipewire-1.2.0:= )
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- libdisplay? ( media-libs/libdisplay-info )
test? (
>=x11-libs/gtk+-3.19.8:3[X,introspection?]
gnome-extra/zenity
@@ -197,7 +197,6 @@ src_configure() {
$(meson_use input_devices_wacom libwacom)
-Dsound_player=true
-Dstartup_notification=true
- $(meson_feature libdisplay libdisplay_info)
$(meson_use X sm)
$(meson_use introspection)
$(meson_use gtk-doc docs)
