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 222B31580E0 for ; Sun, 26 Jan 2025 17:33:41 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 0F19934356D for ; Sun, 26 Jan 2025 17:33:41 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 76621110487; Sun, 26 Jan 2025 17:33:02 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 6ECAA110485 for ; Sun, 26 Jan 2025 17:33:02 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 256EF343573 for ; Sun, 26 Jan 2025 17:33:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C617C2630 for ; Sun, 26 Jan 2025 17:32:58 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1737912668.c16e858718237269666db9f0415fc953397d8577.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/mutter/mutter-9999.ebuild X-VCS-Directories: x11-wm/mutter/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: c16e858718237269666db9f0415fc953397d8577 X-VCS-Branch: master Date: Sun, 26 Jan 2025 17:32:58 +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: 2a1a666b-a4b2-47dd-b307-f866d0314943 X-Archives-Hash: 3e0b5e7fc8e2c0a95e7b614897ee5198 commit: c16e858718237269666db9f0415fc953397d8577 Author: Pacho Ramos gentoo org> AuthorDate: Sun Jan 26 17:31:08 2025 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Jan 26 17:31:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c16e8587 x11-wm/mutter: sync live ebuild Signed-off-by: Pacho Ramos gentoo.org> x11-wm/mutter/mutter-9999.ebuild | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild index 60a229a50d19..f5d1d2344111 100644 --- a/x11-wm/mutter/mutter-9999.ebuild +++ b/x11-wm/mutter/mutter-9999.ebuild @@ -15,11 +15,11 @@ 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 ~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 screencast sysprof systemd test udev wayland video_cards_nvidia" +IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection +libdisplay screencast sysprof systemd test udev wayland X video_cards_nvidia" # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider REQUIRED_USE=" gtk-doc? ( introspection ) @@ -34,6 +34,7 @@ RESTRICT="!test? ( test )" # 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 @@ -41,9 +42,10 @@ RDEPEND=" >=x11-libs/cairo-1.14[X] >=x11-libs/pixman-0.42 >=dev-libs/fribidi-1.0.0 - >=gnome-base/gsettings-desktop-schemas-47.0[introspection?] + >=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?] >=x11-libs/libxkbcommon-0.4.3 x11-libs/libICE >=app-accessibility/at-spi2-core-2.46:2[introspection?] @@ -52,7 +54,6 @@ 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= ) @@ -60,9 +61,9 @@ RDEPEND=" media-libs/libglvnd[X] + >=dev-libs/wayland-1.23.0 wayland? ( - >=dev-libs/wayland-protocols-1.38 - >=dev-libs/wayland-1.23.0 + >=dev-libs/wayland-protocols-1.36 >=x11-libs/libdrm-2.4.118 media-libs/mesa[gbm(+)] @@ -82,6 +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 ) test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] gnome-extra/zenity @@ -177,20 +179,20 @@ src_configure() { -Dudev_dir=$(get_udevdir) $(meson_use input_devices_wacom libwacom) -Dsound_player=true - -Dpango_ft2=true -Dstartup_notification=true + $(meson_feature libdisplay libdisplay_info) -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) + $(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 @@ -218,7 +220,7 @@ src_test() { 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 + GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test } pkg_postinst() {