From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 31032158074 for ; Sun, 29 Jun 2025 22:52:57 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 15535341E81 for ; Sun, 29 Jun 2025 22:52:57 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id B0CE511055B; Sun, 29 Jun 2025 22:52:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id AADC511055B for ; Sun, 29 Jun 2025 22:52:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 526AF341442 for ; Sun, 29 Jun 2025 22:52:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FFCADA0 for ; Sun, 29 Jun 2025 22:52:51 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1751237527.b227ba074afdfe81c17ef0947ee9a78a0894ade3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/mutter/Manifest x11-wm/mutter/mutter-47.9.ebuild X-VCS-Directories: x11-wm/mutter/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b227ba074afdfe81c17ef0947ee9a78a0894ade3 X-VCS-Branch: master Date: Sun, 29 Jun 2025 22:52:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d80a255d-f55f-4b53-aa17-1fe8d2fc9e73 X-Archives-Hash: 8c276405547a41392aa33f4078707d29 commit: b227ba074afdfe81c17ef0947ee9a78a0894ade3 Author: Sam James gentoo org> AuthorDate: Sun Jun 29 22:21:05 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 29 22:52:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b227ba07 x11-wm/mutter: add 47.9 Signed-off-by: Sam James gentoo.org> x11-wm/mutter/Manifest | 1 + x11-wm/mutter/mutter-47.9.ebuild | 256 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 257 insertions(+) diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 437bb5864046..9c578bff5c64 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -2,3 +2,4 @@ DIST mutter-46.7.tar.xz 6755308 BLAKE2B 69cb8457ec9ab905c8764ffa8fbd44050431b359 DIST mutter-47.6.tar.xz 6858272 BLAKE2B 7275961beb30e6aac0004805c6e5248d0cf19caa245ea13918a59b48dc85370698a5c6dadb13af6875bf4a7e1a02f5e9b6d9180e9b711b0888b10d41be5ab8d7 SHA512 8997096b3dab1e98532fd238b921fa7820621c0f0ac1701f4abfa37b1cc29095bb60ecee1135a6be147d06fcede86276b8a02d5dbca7d1dcba2d51c43821bfc9 DIST mutter-47.8.1.tar.xz 6859284 BLAKE2B 2ebac60ae6d56370dd8325cfd657ae9b0970db64ed93c5cd1cd9a476dc4840507ca0e7d2c74214902be6140fad84d038b0dae2902969a3db6841a2a38fd9550e SHA512 b373ebed2fa0b4a9185f2bb3b0bbc7412a736a901a9ecbce89093e53f21137057bbe82f07e43a112b8b2145717e8f76178e2c29381c3dffc43b84eebe868802e DIST mutter-47.8.tar.xz 6859416 BLAKE2B 596dfb932481f9d2e090e29bb5dd5d8e8a5e369714759080010d7cd55d03928d6a2126a3897e569b4d7447b74ae857c42e51e7d2f8ab7db040513e71257e625d SHA512 e7c90a79853c98ee9c0d0fcfd65c95c1525b9171d7c463e8a3be124190a80632905992b4dc2a172d2f28b8302f17bc6f24de660517b3337c070660e726a17fa1 +DIST mutter-47.9.tar.xz 6860464 BLAKE2B 4ce64bb8b979ff8e5fb006893e525fba23479d1e577de5fc631c1a5f3eda806c29f3c41ac3cd25deee301a7276dc10e48cca32e17c3ae88672fb1d023499b0b2 SHA512 aa4cfc2e096c3626c7796982863033792f9eb028bac7fdc61d9b7886dbc3aafa0a979d1b28f5729143d15ea9df695073259a9d46d309229412fd4741e836f9e2 diff --git a/x11-wm/mutter/mutter-47.9.ebuild b/x11-wm/mutter/mutter-47.9.ebuild new file mode 100644 index 000000000000..224737a2e7f4 --- /dev/null +++ b/x11-wm/mutter/mutter-47.9.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_{11..14} ) +inherit gnome.org gnome2-utils meson python-any-r1 udev xdg + +DESCRIPTION="GNOME compositing window manager based on Clutter" +HOMEPAGE="https://mutter.gnome.org" +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-.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 +}