Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/
Date: Sun, 19 Mar 2023 23:38:30
Message-Id: 1679269098.90c0362270a8a7e9a1ba1c9979b30873d49b77ca.mattst88@gentoo
1 commit: 90c0362270a8a7e9a1ba1c9979b30873d49b77ca
2 Author: Guillermo Joandet <gjoandet <AT> gmail <DOT> com>
3 AuthorDate: Sun Mar 19 18:35:38 2023 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 19 23:38:18 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c03622
7
8 x11-wm/mutter: Version bump to 44.0
9
10 Signed-off-by: Guillermo Joandet <gjoandet <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/30238
12 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
13
14 x11-wm/mutter/Manifest | 1 +
15 x11-wm/mutter/mutter-44.0.ebuild | 216 +++++++++++++++++++++++++++++++++++++++
16 2 files changed, 217 insertions(+)
17
18 diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
19 index 8f6b40f3f400..536a834288d1 100644
20 --- a/x11-wm/mutter/Manifest
21 +++ b/x11-wm/mutter/Manifest
22 @@ -1,3 +1,4 @@
23 DIST mutter-43.2.tar.xz 2781032 BLAKE2B cb4fc05ae9b53029649e9c80c8ce450d383a41f142ff1000bca6f9c1ddc707897511b5b54e8e28b4d263d19cffdfa699cef034d667cd8f166f8274c0f237d41a SHA512 ae6afccdf6af99197072afabf0900e1a72f38acfa6c4d039e8db03d21e89513f8828f29eb292ca9dfdec64388dcc4a93db64139e3af66706aaac81461b5da96d
24 DIST mutter-43.3.tar.xz 2782016 BLAKE2B 9a931dba410a71e67383a453c4480622fce3333ea5d7466bf05cf20b474e3cb06288ea8015bc391a77fc3a358c60282a965428c4984006a0ea8db9a7cfee2e2f SHA512 5e9d4b213ac674889af9c15dd52f79a28a1c38af57f08a19bd6b2bf78a799aaa2f6dcb76adb9fa8d6a94e21d988befc37a696bc06801c96e1f692c80a5aff2ae
25 +DIST mutter-44.0.tar.xz 2838932 BLAKE2B 0a5ea5a45a8074face45727af5d332ef61d69180d941634bf1ab673f53cd710893ccbedd16cb7bc1a09b51120b2047105a04a8eae4fbcb3803179eba89c7d73e SHA512 c7d35e797d080f90cc43b2904bb04d2328fecd13cd7d1ab12b1db735d331b2df9501668c2e0f7a10ea3ad9821048b09cbeb7149fcda3d43f37e5a1834bb04e2b
26 DIST mutter-44.rc.tar.xz 2837848 BLAKE2B 7590afd00f6e6e65062675fd2478a8b7f41e7199f0ea0f77ccd8e62ba6e07bdefea57f8206a1f57cef101c97abe9f621cd4bf3cabca0d2bd0249f330c104072d SHA512 1d7659f9b4bb96ea50c32f122a8e621639007d023970cfeeb2afe5351abc38b9a697163019e26c85cad611f65eccbcd9f940ff1ff5ab10509fda8122c43f9a66
27
28 diff --git a/x11-wm/mutter/mutter-44.0.ebuild b/x11-wm/mutter/mutter-44.0.ebuild
29 new file mode 100644
30 index 000000000000..5ef3fcb79b38
31 --- /dev/null
32 +++ b/x11-wm/mutter/mutter-44.0.ebuild
33 @@ -0,0 +1,216 @@
34 +# Copyright 1999-2023 Gentoo Authors
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI=8
38 +PYTHON_COMPAT=( python3_{9..11} )
39 +inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
40 +
41 +DESCRIPTION="GNOME compositing window manager based on Clutter"
42 +HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
43 +
44 +LICENSE="GPL-2+"
45 +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
46 +
47 +IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
48 +# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
49 +REQUIRED_USE="
50 + gtk-doc? ( introspection )
51 + wayland? ( ^^ ( elogind systemd ) udev )
52 + test? ( wayland )"
53 +RESTRICT="!test? ( test )"
54 +
55 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
56 +
57 +# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
58 +# xorg-server is needed at build and runtime with USE=wayland for Xwayland
59 +# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
60 +DEPEND="
61 + >=media-libs/graphene-1.10.2[introspection?]
62 + x11-libs/gdk-pixbuf:2
63 + >=x11-libs/pango-1.46[introspection?]
64 + >=x11-libs/cairo-1.14[X]
65 + >=dev-libs/fribidi-1.0.0
66 + >=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
67 + >=dev-libs/glib-2.75.1:2
68 + gnome-base/gnome-settings-daemon
69 + >=dev-libs/json-glib-0.12.0[introspection?]
70 + >=x11-libs/libxkbcommon-0.4.3
71 + x11-libs/libICE
72 + >=app-accessibility/at-spi2-core-2.46:2[introspection?]
73 + sys-apps/dbus
74 + >=x11-misc/colord-1.4.5:=
75 + >=media-libs/lcms-2.6:2
76 + >=media-libs/harfbuzz-2.6.0
77 +
78 + gnome? ( gnome-base/gnome-desktop:4= )
79 +
80 + >=media-libs/libcanberra-0.26
81 +
82 + media-libs/libglvnd[X]
83 +
84 + wayland? (
85 + >=dev-libs/wayland-protocols-1.31
86 + >=dev-libs/wayland-1.21.0
87 +
88 + x11-libs/libdrm
89 + media-libs/mesa[gbm(+)]
90 + >=dev-libs/libinput-1.18.0:=
91 +
92 + elogind? ( sys-auth/elogind )
93 + x11-base/xwayland
94 + video_cards_nvidia? ( gui-libs/egl-wayland )
95 + )
96 + udev? (
97 + >=virtual/libudev-232-r1:=
98 + >=dev-libs/libgudev-232
99 + )
100 + systemd? ( sys-apps/systemd )
101 + x11-libs/libSM
102 + input_devices_wacom? ( >=dev-libs/libwacom-0.13:= )
103 + >=x11-libs/startup-notification-0.7
104 + screencast? ( >=media-video/pipewire-0.3.21:= )
105 + introspection? ( >=dev-libs/gobject-introspection-1.54:= )
106 + test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] )
107 + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 )
108 +"
109 +# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional.
110 +# X? (
111 +DEPEND+="
112 + >=gui-libs/gtk-4.0.0:4[X,introspection?]
113 + >=x11-libs/libX11-1.7.0
114 + >=x11-libs/libXcomposite-0.4
115 + x11-libs/libXcursor
116 + x11-libs/libXdamage
117 + x11-libs/libXext
118 + >=x11-libs/libXfixes-3
119 + >=x11-libs/libXi-1.7.4
120 + x11-libs/libXtst
121 + x11-libs/libxkbfile
122 + x11-misc/xkeyboard-config
123 + >=x11-libs/libxkbcommon-0.4.3[X]
124 + x11-libs/libXrender
125 + >=x11-libs/libXrandr-1.5.0
126 + x11-libs/libxcb:=
127 + x11-libs/libXinerama
128 + x11-libs/libXau
129 +"
130 +# )"
131 +
132 +RDEPEND="${DEPEND}
133 + gnome-extra/zenity
134 +
135 + !<gui-libs/gtk-4.6.4:4
136 +"
137 +DEPEND="${DEPEND}
138 + x11-base/xorg-proto
139 + sysprof? ( >=dev-util/sysprof-common-3.38.0 )
140 +"
141 +BDEPEND="
142 + dev-util/wayland-scanner
143 + dev-util/gdbus-codegen
144 + dev-util/glib-utils
145 + >=sys-devel/gettext-0.19.8
146 + virtual/pkgconfig
147 + gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
148 + test? (
149 + ${PYTHON_DEPS}
150 + $(python_gen_any_dep '
151 + >=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]
152 + ')
153 + app-text/docbook-xml-dtd:4.5
154 + x11-misc/xvfb-run
155 + )
156 + wayland? (
157 + >=sys-kernel/linux-headers-4.4
158 + x11-libs/libxcvt
159 + )
160 +"
161 +
162 +PATCHES=(
163 + "${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch
164 +)
165 +
166 +python_check_deps() {
167 + if use test; then
168 + python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
169 + fi
170 +}
171 +
172 +src_prepare() {
173 + default
174 +
175 + sed -i -e "s:#!/usr/bin/bash:#!$(command -v bash):" src/tests/x11-test.sh || die
176 +}
177 +
178 +src_configure() {
179 + local emesonargs=(
180 + --buildtype $(usex debug debug plain)
181 + -Dopengl=true
182 + -Dopengl_libname=libOpenGL
183 + $(meson_use wayland gles2)
184 + #gles2_libname
185 + -Degl=true
186 + -Dglx=true
187 + $(meson_use wayland)
188 + $(meson_use wayland xwayland)
189 + $(meson_use systemd)
190 + $(meson_use wayland native_backend)
191 + $(meson_use screencast remote_desktop)
192 + -Dlibgnome_desktop=true
193 + $(meson_use udev)
194 + -Dudev_dir=$(get_udevdir)
195 + $(meson_use input_devices_wacom libwacom)
196 + -Dsound_player=true
197 + -Dpango_ft2=true
198 + -Dstartup_notification=true
199 + -Dsm=true
200 + $(meson_use introspection)
201 + $(meson_use gtk-doc docs)
202 + $(meson_use test cogl_tests)
203 + $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
204 + -Dnative_tests=false
205 + $(meson_use test clutter_tests)
206 + $(meson_use test tests)
207 + -Dkvm_tests=false
208 + -Dtty_tests=false
209 + $(meson_use sysprof profiler)
210 + -Dinstalled_tests=false
211 +
212 + #verbose # Let upstream choose default for verbose mode
213 + #xwayland_path
214 + # 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)
215 + #xwayland_grab_default_access_rules
216 + )
217 +
218 + if use wayland && use video_cards_nvidia; then
219 + emesonargs+=(
220 + -Degl_device=true
221 + -Dwayland_eglstream=true
222 + )
223 + else
224 + emesonargs+=(
225 + -Degl_device=false
226 + -Dwayland_eglstream=false
227 + )
228 + fi
229 +
230 + meson_src_configure
231 +}
232 +
233 +src_test() {
234 + gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
235 + glib-compile-schemas "${BUILD_DIR}"/data
236 + GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
237 +}
238 +
239 +pkg_postinst() {
240 + use udev && udev_reload
241 + xdg_pkg_postinst
242 + gnome2_schemas_update
243 +}
244 +
245 +pkg_postrm() {
246 + use udev && udev_reload
247 + xdg_pkg_postrm
248 + gnome2_schemas_update
249 +}