summaryrefslogtreecommitdiff
path: root/x11-wm/mutter
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/mutter')
-rw-r--r--x11-wm/mutter/Manifest6
-rw-r--r--x11-wm/mutter/metadata.xml1
-rw-r--r--x11-wm/mutter/mutter-47.6.ebuild256
-rw-r--r--x11-wm/mutter/mutter-9999.ebuild77
4 files changed, 308 insertions, 32 deletions
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 3f43c9e510cc..dfc8caeaef00 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,7 +1,9 @@
AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e7c2f30dc143100b1f564d816084cf06043439d44697602f042e4905121e949c7a5397556a32815eaae9bd2d671d1fdcdb6ca863fb7d4b1 SHA512 b1a9e7c01e35c1c00f34412f7522cdd601cf3af569a571fe9353839429cf76bf6d9b847da500663834c4eae6e05031eaa4ec770ee89807978a784db4b1bc813b
DIST mutter-46.7.tar.xz 6755308 BLAKE2B 69cb8457ec9ab905c8764ffa8fbd44050431b359e349697615b90d201402dffd2bd850e3fb0f393ab75800d148c2805ac791f69d356c6bfb26007a2394cbbd48 SHA512 0d9b159805b79f90d2cb06582c859b10e56bc22001d1e1b0090821914e18085749a54eb117b94788578b17894e4d28ec408144a09b29f94b7785f7538c4613a8
DIST mutter-47.4.tar.xz 6857716 BLAKE2B 752e83e5d0e89eb31e577543619d3039c720a358cbad77e2be1abd7eabedd333ce86673b31e23cbeea446e335f64f83bd68ce12ed37c48eae22a4be6123f14b2 SHA512 f1d3c16830a5fd8225f62d37f583931d582ed1d09631b1d44321a162c14b4d99b2487f322a4c95954b154cdc205b0d20d5d12663f89675baff211e49067ef1ee
+DIST mutter-47.6.tar.xz 6858272 BLAKE2B 7275961beb30e6aac0004805c6e5248d0cf19caa245ea13918a59b48dc85370698a5c6dadb13af6875bf4a7e1a02f5e9b6d9180e9b711b0888b10d41be5ab8d7 SHA512 8997096b3dab1e98532fd238b921fa7820621c0f0ac1701f4abfa37b1cc29095bb60ecee1135a6be147d06fcede86276b8a02d5dbca7d1dcba2d51c43821bfc9
EBUILD mutter-46.7-r1.ebuild 7030 BLAKE2B 11b58e9a9400b2c44b3ff065f5217292ff3111788abe333c9d578474a8173ebfb54ca107d3db6fd05432c51648b6608beedfed1ae41ed7e79f805a59cb008b81 SHA512 0b271da8bc182c98dc45a5f5fdaf061f586314cdc4cb0f8969d870666b2b092850169fc2fbb98632cb985f32eca8752c5a3f20c6f8ec2fa82c4700ac9c8d21b1
EBUILD mutter-47.4.ebuild 7103 BLAKE2B 0d7a9a7eac3c66e80d90e39bd455cfd650d19eae64b5d81481cc38595722a1f918fedf6501d4b2c488c172ffce2abf00cb6260bceb14ec2b7241d76a39813166 SHA512 df21fe8d2a3a6c51bdc449b78aa6cf905ac8cbf9f126a8e46d5013e06ecb326806eac54b96e98a08c8257229196b7f6db1d337937b832b87470830da2965f117
-EBUILD mutter-9999.ebuild 7103 BLAKE2B 0d7a9a7eac3c66e80d90e39bd455cfd650d19eae64b5d81481cc38595722a1f918fedf6501d4b2c488c172ffce2abf00cb6260bceb14ec2b7241d76a39813166 SHA512 df21fe8d2a3a6c51bdc449b78aa6cf905ac8cbf9f126a8e46d5013e06ecb326806eac54b96e98a08c8257229196b7f6db1d337937b832b87470830da2965f117
-MISC metadata.xml 689 BLAKE2B 3b0c44fcf959b671938bb12f0361d57714e2f6d1bc2618482f60c0c3a5dc3ea573371d62839d1304164cfcd2033b49a19a13e4ead64361469b61f5788c126295 SHA512 4eebf7db2174e91ee55b8abc051a7b1c00f1a773c754979f6613e14b0d6b195e581aca8a2614b88b971f30c2ef4090601059bf2bc8ea4a0e7cfaae4c66070997
+EBUILD mutter-47.6.ebuild 7276 BLAKE2B 0a10fcb779aa74f8328da11b80e5162dbac280f8078c0352d0ff9214c05d39f76e6aad18dd125f053fa2466161da4b645872ea0cd1624a41bfab089a0527d9aa SHA512 a035f303a40c356433c4bead6df3d0d00cbb248e5cbdd920fff3c85d598bef52a81ce91833dc76f896098d3a2996110a54aed1fa8cfaabab9e4260d780808790
+EBUILD mutter-9999.ebuild 7223 BLAKE2B 2d8a56272f290952128045c85f2860488bfadaa5a9b14fc40c01e68e70abe7ea6e48fdc3b5ffcac57907b04188dc71d1c5381bfe1bcca95a2bad4646a43b5572 SHA512 3ac15dc2de9ec1e435948a6c182c2ff8fba863f70271aef241f9c10fb9ca7cf7a53bb268fdcfb85cbc9f024271c751e55058f840f040150cf4be28ac658e9b13
+MISC metadata.xml 773 BLAKE2B fb0959115124407e5064157426ceaa356d1f5943d81aed895ecbfd62a9d0bf09b96d16f2cba8e09e3b52a4bffa3db612c5e72b002cd820f1397d9e98493f16f8 SHA512 16555c0e7f2cdd579245047cff06fcba6a9e003b3413a2db085e2f01195e5ec0c08db8b436a51c3cd599eecb099b146142264df4df9aa46ae375ca9f931e3a90
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
index 887778a18ca5..3da97524fc90 100644
--- a/x11-wm/mutter/metadata.xml
+++ b/x11-wm/mutter/metadata.xml
@@ -9,6 +9,7 @@
<flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as logind provider for Wayland sessions</flag>
<flag name="libdisplay">Enable EDID and DisplayID using <pkg>media-libs/libdisplay-info</pkg></flag>
<flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
+ <flag name="xwayland">Enable X11 application support in Wayland sessions</flag>
</use>
<upstream>
<remote-id type="gnome-gitlab">GNOME/mutter</remote-id>
diff --git a/x11-wm/mutter/mutter-47.6.ebuild b/x11-wm/mutter/mutter-47.6.ebuild
new file mode 100644
index 000000000000..7c95e3ddf2d6
--- /dev/null
+++ b/x11-wm/mutter/mutter-47.6.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
+
+DESCRIPTION="GNOME compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+LICENSE="GPL-2+"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git"
+ SRC_URI=""
+ SLOT="0/15" # This can get easily out of date, but better than 9967
+else
+ 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
+
+IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection +libdisplay 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 )
+ gtk-doc? ( introspection )
+ wayland? ( ^^ ( elogind systemd ) udev )
+ test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with
+# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future;
+# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off
+# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's
+# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow).
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+# dev-libs/wayland is always needed at build time due to https://bugs.gentoo.org/937632
+RDEPEND="
+ >=media-libs/graphene-1.10.2[introspection?]
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/pango-1.46[introspection?]
+ >=x11-libs/cairo-1.14[X]
+ >=x11-libs/pixman-0.42
+ >=dev-libs/fribidi-1.0.0
+ >=gnome-base/gsettings-desktop-schemas-47_beta[introspection?]
+ >=dev-libs/glib-2.81.1:2
+ gnome-base/gnome-settings-daemon
+ >=dev-libs/json-glib-0.12.0[introspection?]
+ >=app-accessibility/at-spi2-core-2.46:2[introspection?]
+ sys-apps/dbus
+ >=x11-misc/colord-1.4.5:=
+ >=media-libs/lcms-2.6:2
+ >=media-libs/harfbuzz-2.6.0:=
+ >=dev-libs/libei-1.0.901
+
+ gnome? ( gnome-base/gnome-desktop:4= )
+
+ >=media-libs/libcanberra-0.26
+
+ media-libs/libglvnd[X]
+
+ >=dev-libs/wayland-1.23.0
+ wayland? (
+ >=dev-libs/wayland-protocols-1.36
+
+ >=x11-libs/libdrm-2.4.118
+ media-libs/mesa[gbm(+)]
+ >=dev-libs/libinput-1.26.0:=
+
+ elogind? ( sys-auth/elogind )
+ xwayland? ( >=x11-base/xwayland-23.2.1[libei(+)] )
+ video_cards_nvidia? ( gui-libs/egl-wayland )
+ )
+ udev? (
+ >=virtual/libudev-232-r1:=
+ >=dev-libs/libgudev-238
+ )
+ systemd? ( sys-apps/systemd )
+ x11-libs/libSM
+ input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
+ >=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
+ )
+ sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 )
+"
+
+X_OR_XWAYLAND_DEPS="
+ >=gui-libs/gtk-4.0.0:4[X,introspection?]
+ >=x11-libs/libX11-1.7.0
+ >=x11-libs/libXcomposite-0.4
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ >=x11-libs/libXfixes-6
+ >=x11-libs/libXi-1.7.4
+ x11-libs/libxkbfile
+ x11-misc/xkeyboard-config
+ x11-libs/libXrender
+ x11-libs/libxcb:=
+ x11-libs/libXinerama
+ x11-libs/libXau
+"
+
+RDEPEND+="
+ X? (
+ ${X_OR_XWAYLAND_DEPS}
+ x11-libs/libICE
+ >=x11-libs/libXrandr-1.5.0
+ >=x11-libs/libxkbcommon-0.4.3[X]
+ x11-libs/libXtst
+ )
+ wayland? ( xwayland? ( ${X_OR_XWAYLAND_DEPS} ) )
+"
+
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ sysprof? ( >=dev-util/sysprof-common-3.38.0 )
+"
+BDEPEND="
+ dev-util/wayland-scanner
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+ test? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ >=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
+ ')
+ app-text/docbook-xml-dtd:4.5
+ X? ( x11-misc/xvfb-run )
+ )
+ wayland? (
+ >=sys-kernel/linux-headers-4.4
+ x11-libs/libxcvt
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
+)
+
+python_check_deps() {
+ if use test; then
+ python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
+ fi
+}
+
+src_configure() {
+ use debug && EMESON_BUILDTYPE=debug
+ local emesonargs=(
+ # Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass
+ #
+ # -Dopengl_libname=libOpenGL.so.0
+ #
+ # while we build the x11 renderer, as we currently enable gles2 only
+ # with USE=wayland and x11 renderer wouldn't find the needed GLX symbols
+ # in a configuration where wayland is disabled, as libOpenGL doesn't
+ # include them.
+ #
+ # See
+ # - https://bugs.gentoo.org/835786
+ # - https://forums.gentoo.org/viewtopic-p-8695669.html
+
+ -Dopengl=true
+ $(meson_use wayland gles2)
+ #gles2_libname
+ -Degl=true
+ $(meson_use X glx)
+ $(meson_use wayland)
+ )
+
+ if use wayland; then
+ emesonargs+=(
+ $(meson_use xwayland)
+ )
+ else
+ emesonargs+=(
+ -Dxwayland=false
+ )
+ fi
+
+ emesonargs+=(
+ $(meson_use systemd)
+ $(meson_use wayland native_backend)
+ $(meson_use screencast remote_desktop)
+ $(meson_use gnome libgnome_desktop)
+ $(meson_use udev)
+ -Dudev_dir=$(get_udevdir)
+ $(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)
+ $(meson_use test cogl_tests)
+ $(meson_use test clutter_tests)
+ $(meson_use test mutter_tests)
+ $(meson_feature test tests)
+ -Dkvm_tests=false
+ -Dtty_tests=false
+ $(meson_use sysprof profiler)
+ -Dinstalled_tests=false
+ $(meson_use X x11)
+
+ #verbose # Let upstream choose default for verbose mode
+ #xwayland_path
+ # TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+ #xwayland_grab_default_access_rules
+ )
+
+ if use wayland && use video_cards_nvidia; then
+ emesonargs+=(
+ -Degl_device=true
+ -Dwayland_eglstream=true
+ )
+ else
+ emesonargs+=(
+ -Degl_device=false
+ -Dwayland_eglstream=false
+ )
+ fi
+
+ meson_src_configure
+}
+
+src_test() {
+ # Reset variables to avoid issues from /etc/profile.d/flatpak.sh file
+ gnome2_environment_reset
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+ glib-compile-schemas "${BUILD_DIR}"/data
+ GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data
+
+ # FIXME: Check on bump, needs access do /dev/dri/
+ meson_src_test
+}
+
+pkg_postinst() {
+ use udev && udev_reload
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ use udev && udev_reload
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index f5d1d2344111..67bbd11dda6f 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -13,15 +13,16 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git"
SRC_URI=""
- SLOT="0/14" # This can get easily out of date, but better than 9967
+ SLOT="0/15" # This can get easily out of date, but better than 9967
else
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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
-IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection +libdisplay screencast sysprof systemd test udev wayland X video_cards_nvidia"
+IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection +libdisplay 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 )
gtk-doc? ( introspection )
wayland? ( ^^ ( elogind systemd ) udev )
test? ( wayland )"
@@ -46,8 +47,6 @@ RDEPEND="
>=dev-libs/glib-2.81.1:2
gnome-base/gnome-settings-daemon
>=dev-libs/json-glib-0.12.0[introspection?]
- >=x11-libs/libxkbcommon-0.4.3
- x11-libs/libICE
>=app-accessibility/at-spi2-core-2.46:2[introspection?]
sys-apps/dbus
>=x11-misc/colord-1.4.5:=
@@ -70,7 +69,7 @@ RDEPEND="
>=dev-libs/libinput-1.26.0:=
elogind? ( sys-auth/elogind )
- >=x11-base/xwayland-23.2.1[libei(+)]
+ xwayland? ( >=x11-base/xwayland-23.2.1[libei(+)] )
video_cards_nvidia? ( gui-libs/egl-wayland )
)
udev? (
@@ -90,28 +89,34 @@ RDEPEND="
)
sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 )
"
-# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
-# X? (
+
+X_OR_XWAYLAND_DEPS="
+ >=gui-libs/gtk-4.0.0:4[X,introspection?]
+ >=x11-libs/libX11-1.7.0
+ >=x11-libs/libXcomposite-0.4
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ >=x11-libs/libXfixes-6
+ >=x11-libs/libXi-1.7.4
+ x11-libs/libxkbfile
+ x11-misc/xkeyboard-config
+ x11-libs/libXrender
+ x11-libs/libxcb:=
+ x11-libs/libXinerama
+ x11-libs/libXau
+"
+
RDEPEND+="
- >=gui-libs/gtk-4.0.0:4[X,introspection?]
- >=x11-libs/libX11-1.7.0
- >=x11-libs/libXcomposite-0.4
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- >=x11-libs/libXfixes-6
- >=x11-libs/libXi-1.7.4
- x11-libs/libXtst
- x11-libs/libxkbfile
- x11-misc/xkeyboard-config
- >=x11-libs/libxkbcommon-0.4.3[X]
- x11-libs/libXrender
- >=x11-libs/libXrandr-1.5.0
- x11-libs/libxcb:=
- x11-libs/libXinerama
- x11-libs/libXau
+ X? (
+ ${X_OR_XWAYLAND_DEPS}
+ x11-libs/libICE
+ >=x11-libs/libXrandr-1.5.0
+ >=x11-libs/libxkbcommon-0.4.3[X]
+ x11-libs/libXtst
+ )
+ wayland? ( xwayland? ( ${X_OR_XWAYLAND_DEPS} ) )
"
-# )"
DEPEND="${RDEPEND}
x11-base/xorg-proto
@@ -130,7 +135,7 @@ BDEPEND="
>=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
')
app-text/docbook-xml-dtd:4.5
- x11-misc/xvfb-run
+ X? ( x11-misc/xvfb-run )
)
wayland? (
>=sys-kernel/linux-headers-4.4
@@ -168,9 +173,21 @@ src_configure() {
$(meson_use wayland gles2)
#gles2_libname
-Degl=true
- -Dglx=true
+ $(meson_use X glx)
$(meson_use wayland)
- $(meson_use wayland xwayland)
+ )
+
+ if use wayland; then
+ emesonargs+=(
+ $(meson_use xwayland)
+ )
+ else
+ emesonargs+=(
+ -Dxwayland=false
+ )
+ fi
+
+ emesonargs+=(
$(meson_use systemd)
$(meson_use wayland native_backend)
$(meson_use screencast remote_desktop)
@@ -181,7 +198,7 @@ src_configure() {
-Dsound_player=true
-Dstartup_notification=true
$(meson_feature libdisplay libdisplay_info)
- -Dsm=true
+ $(meson_use X sm)
$(meson_use introspection)
$(meson_use gtk-doc docs)
$(meson_use test cogl_tests)
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 09:52:51 +0000