diff options
Diffstat (limited to 'x11-wm/mutter')
| -rw-r--r-- | x11-wm/mutter/Manifest | 3 | ||||
| -rw-r--r-- | x11-wm/mutter/files/mutter-45.2-fullscreen-leak.patch | 37 | ||||
| -rw-r--r-- | x11-wm/mutter/mutter-45.2.ebuild | 238 |
3 files changed, 278 insertions, 0 deletions
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 636843a6e609..6fd6e79bc715 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,11 +1,14 @@ AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e7c2f30dc143100b1f564d816084cf06043439d44697602f042e4905121e949c7a5397556a32815eaae9bd2d671d1fdcdb6ca863fb7d4b1 SHA512 b1a9e7c01e35c1c00f34412f7522cdd601cf3af569a571fe9353839429cf76bf6d9b847da500663834c4eae6e05031eaa4ec770ee89807978a784db4b1bc813b +AUX mutter-45.2-fullscreen-leak.patch 1208 BLAKE2B 78285ae0a54e94b08831a425cd199b52b0d9dab2d11418ce8c74d44ad9a384728b821061f29b9de3608725ec0c3f896439045318e9792751fb806b3656085e32 SHA512 18ec1c193068c434e861498fe28715bdeb7069ca26be96bdf2b0deb1b3dcf580199fca17f8920704eba2e2058155e088bca72436dbcfdcd8fa3ef10a2990d960 DIST mutter-44.3.tar.xz 2848256 BLAKE2B 42c00d4673cab5d119361c6eb2b78c33894c637b36a34f9b74eb5a19ca621d3458208be020216f9a8949e8b0a9c9de697662c5aebb11f70bc83173ce33c7a1eb SHA512 d29bc6c7407ba81be0b5bfa2333bc77c09f7a084e09d6902cad8ca8e64ba75a22652b68a4e84b79b80481d9a7b6cb490128113dcd125ed5bcd5423d4ec88fb35 DIST mutter-44.4.tar.xz 2847392 BLAKE2B 2ecdb0d447c0426a7e02f4d3b3cdf8936a6c7a5fecad163bdba9428f018e0ceb2047b241422bc9de5e9d0fb08e88a04d572d1b404b48d6df214a7263292309ba SHA512 3f7b37be5531e270c071fc9784a6a284a3d715dfd1dfc854779126197d6e53c660836412ba08e6233747c7b016926114a57be5adb36a11c8ec9c81e333ce668c DIST mutter-45.0.tar.xz 2883164 BLAKE2B cb006cae08a8e4b1c6404ab99b970854a05d764361936d88d726ece6583e922b8e5bab4189ec240292d14cfb312fb1cadafa17e372d332dfc194bdc0041e4441 SHA512 bbf813a720a3d8545969d089790f6e4c19cd5c8eb3079ba028945e4728446c78aa7540061ea87e43151c2ef359ea986b0e7a45f56f0eb6a33ca2c3979955bb43 DIST mutter-45.1.tar.xz 2881852 BLAKE2B 40fa8de01ecae346d2b9a352d55cb9215e3b9c88d7424c567fd63aa97dc7aa7cc202fdda298a4a8a9bc08330b6db3895d5860b8c99daaa4974dbd07f0ac8b86a SHA512 87a629e941eb231d05fc24dbb905acb12236c971a02dd000fdd6cc6e7686544b5796ce57d10b34e096dc956578a373d5a73e89760bcc6beb292e9a25ce2faaf4 +DIST mutter-45.2.tar.xz 2884940 BLAKE2B c4107840b8bd0f75a9c76300f324bfff6aac3195f526ab88102c831df693cb8dfa5b55bb1590a54e68f41eab392e69bb833221480578a2fba4b1e4bdc5ed030d SHA512 2111ad0645d2da58dedb30d94e99b52045f38b31a9de7314a5d8b41a5525612d88d2fbaafd3658eb6f734c143ad12176367c26533237199d9a5c1ad3dea743c7 EBUILD mutter-44.3.ebuild 6468 BLAKE2B 796856601f5397ca3740c002ebfd21ef961632d46090e52ca91e13f63b52c9bb00582f7e4803d5fc526f6ff8e8a4cbe33134ab87d704f5d644eb8ea186f9a2dd SHA512 d29521f010e44a415de0cca625ec4d7311ceec2484041d768b4ee23cae0d81b91227b8f6e242d8deba6e2b36b16b611e25ed1d1faf5f89f730c751f0fc5d5920 EBUILD mutter-44.4.ebuild 6471 BLAKE2B 7c44b8a264ae769d84010a232716cf2736d36703fb4a7240226d8d68abb4346a59d7adebf7ba1a83bac91c046e9bbdee7b9bb3888d5edf60941039f28b51cb7e SHA512 e4aa191d597dc966a4d2fcb37aaab18c6b9b97c52b1b7c8a4474aaaa224d1228cdc58f575c411647509b6d3b325b2afba612c25c656ff0d733dd7456ca868039 EBUILD mutter-45.0.ebuild 6490 BLAKE2B b79dcda698d46bd8cdcbda52776726b28d0610610efe8b00a56a6830c4f421e31fcf786e1cab0ab0d0ae342294dd4cf1f7ce2fe8f5ac5b09863f819ce664bdb2 SHA512 b3c216b3f2b9459d7ba371f36bc349c1c45c53b7cd8855f1c5c3d5c073030bab141166e23f70964d46072135bb697580c03e3a634f5c35d5a931a7c5d314ae34 EBUILD mutter-45.1.ebuild 7050 BLAKE2B e46fed2a6a67c4e32eee45679a40e40fdfa6b4d7bf0f63f617296df0c020a38fafe8a70a146e1c24397528ca724ec4eed623d4e11b4d48e1a03674208da61534 SHA512 dcb113962f214519de25ea6c7772ad9e9e9c8546ffcce8ac8cf4d95d8cee69652524983dbae6ac8aba596a1e415c98b844ecd4ed54ba0b8a7bab0f73ee910421 +EBUILD mutter-45.2.ebuild 7096 BLAKE2B 8024cbc000569bc0b00a3fb45f022d4ec6dc32cc50fb05d1181bbe83ac161900351af5d64c38cc6ab35f912a4f9538c91aca8f7dc86ed34d68f548dbde879aa1 SHA512 433f99cb609b38f271a0ebfdaed22047659619483fa3b286b2b4dd1df35b2413bed578ec48708c6de46b193b44820cff31c4e18dae54e56a86e6bda7055d08ea EBUILD mutter-9999.ebuild 7050 BLAKE2B e46fed2a6a67c4e32eee45679a40e40fdfa6b4d7bf0f63f617296df0c020a38fafe8a70a146e1c24397528ca724ec4eed623d4e11b4d48e1a03674208da61534 SHA512 dcb113962f214519de25ea6c7772ad9e9e9c8546ffcce8ac8cf4d95d8cee69652524983dbae6ac8aba596a1e415c98b844ecd4ed54ba0b8a7bab0f73ee910421 MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87 diff --git a/x11-wm/mutter/files/mutter-45.2-fullscreen-leak.patch b/x11-wm/mutter/files/mutter-45.2-fullscreen-leak.patch new file mode 100644 index 000000000000..adbd309c1b7c --- /dev/null +++ b/x11-wm/mutter/files/mutter-45.2-fullscreen-leak.patch @@ -0,0 +1,37 @@ +From bedf8df88f41c34c9824dccba507c8e333dd9ba6 Mon Sep 17 00:00:00 2001 +From: Robert Balas <bluew@r14s.ch> +Date: Mon, 4 Dec 2023 00:27:49 +0100 +Subject: [PATCH] clutter: Fix memory leak when running in fullscreen + +`clutter_stage_do_paint_view()` only gets called when leaving fullscreen +and by that time enough calls to +`clutter_actor_get_transformed_paint_volume()` can make the underlying +GArray grow to a large size. + +To fix this, we call call the cleanup function in +`clutter_stage_finish_layout()` to make it happen every frame. + +Co-authored-by: Sebastian Keller <skeller@gnome.org> + +Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3191 +Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3439> +--- + clutter/clutter/clutter-stage.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c +index 55bb81c2b46..deb383fe216 100644 +--- a/clutter/clutter/clutter-stage.c ++++ b/clutter/clutter/clutter-stage.c +@@ -970,6 +970,8 @@ clutter_stage_finish_layout (ClutterStage *stage) + } + + g_warn_if_fail (!priv->actor_needs_immediate_relayout); ++ ++ _clutter_stage_paint_volume_stack_free_all (stage); + } + + void +-- +GitLab + diff --git a/x11-wm/mutter/mutter-45.2.ebuild b/x11-wm/mutter/mutter-45.2.ebuild new file mode 100644 index 000000000000..40a5b53d810c --- /dev/null +++ b/x11-wm/mutter/mutter-45.2.ebuild @@ -0,0 +1,238 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) +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/13" # This can get easily out of date, but better than 9967 +else + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~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 screencast sysprof systemd test udev wayland video_cards_nvidia" +# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider +REQUIRED_USE=" + 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 +DEPEND=" + >=media-libs/graphene-1.10.2[introspection?] + x11-libs/gdk-pixbuf:2 + >=x11-libs/pango-1.46[introspection?] + >=x11-libs/cairo-1.14[X] + >=dev-libs/fribidi-1.0.0 + >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] + >=dev-libs/glib-2.75.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:= + >=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] + + wayland? ( + >=dev-libs/wayland-protocols-1.32 + >=dev-libs/wayland-1.21.0 + + x11-libs/libdrm + media-libs/mesa[gbm(+)] + >=dev-libs/libinput-1.19.0:= + + elogind? ( sys-auth/elogind ) + >=x11-base/xwayland-23.2.1[libei(+)] + video_cards_nvidia? ( gui-libs/egl-wayland ) + ) + udev? ( + >=virtual/libudev-232-r1:= + >=dev-libs/libgudev-232 + ) + 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-0.3.33:= ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + 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 ) +" +# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional. +# X? ( +DEPEND+=" + >=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 +" +# )" + +RDEPEND="${DEPEND} + + !<gui-libs/gtk-4.6.4:4 +" +DEPEND="${DEPEND} + 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 + x11-misc/xvfb-run + ) + wayland? ( + >=sys-kernel/linux-headers-4.4 + x11-libs/libxcvt + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch + "${FILESDIR}"/${P}-fullscreen-leak.patch +) + +python_check_deps() { + if use test; then + python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]" + fi +} + +src_configure() { + 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 + + --buildtype $(usex debug debug plain) + -Dopengl=true + $(meson_use wayland gles2) + #gles2_libname + -Degl=true + -Dglx=true + $(meson_use wayland) + $(meson_use wayland xwayland) + $(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 + -Dpango_ft2=true + -Dstartup_notification=true + -Dsm=true + $(meson_use introspection) + $(meson_use gtk-doc docs) + $(meson_use test cogl_tests) + $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed + -Dnative_tests=false + $(meson_use test clutter_tests) + $(meson_use test tests) + -Dkvm_tests=false + -Dtty_tests=false + $(meson_use sysprof profiler) + -Dinstalled_tests=false + + #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 meson_src_test --setup=CI +} + +pkg_postinst() { + use udev && udev_reload + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + use udev && udev_reload + xdg_pkg_postrm + gnome2_schemas_update +} |