Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/
Date: Wed, 22 Sep 2021 07:46:07
Message-Id: 1632296703.678c4c8541419806d82e7af4ba1aeaff876ce034.leio@gentoo
1 commit: 678c4c8541419806d82e7af4ba1aeaff876ce034
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 22 06:56:42 2021 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 22 07:45:03 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=678c4c85
7
8 x11-wm/mutter: bump to 40.5
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.2
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 x11-wm/mutter/Manifest | 1 +
14 x11-wm/mutter/mutter-40.5.ebuild | 167 +++++++++++++++++++++++++++++++++++++++
15 2 files changed, 168 insertions(+)
16
17 diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
18 index 099e68d5b87..598788a1366 100644
19 --- a/x11-wm/mutter/Manifest
20 +++ b/x11-wm/mutter/Manifest
21 @@ -1,3 +1,4 @@
22 DIST mutter-40.2.1.tar.xz 2681780 BLAKE2B b273bc9979e285bd6c48afb367f0973114dbc9af086b5aadf41e6dc1cca54f7ca25975a4e2fe5b4acb020fa8f5fc136f0661be2b06deaacf25c363a187567b73 SHA512 f9b50b10f6a4ee8ba3d8d721734d25184675c2af1f14cb8da8cac6a6a60397c36bf39e87db06ac0ed8a0f3cbf78859e57fa965ac0d2593ed9c6aa9692d90d5b2
23 DIST mutter-40.3.tar.xz 2682460 BLAKE2B 41e505adc9aa6ca53d1f43d71051bc09c0f4f528803f10c8f4ad8fe2cf28f5a02a3d3dca1a4a02b702a40177501663e20b68415295805b6c0503690dbb5e53fc SHA512 beb9cb1b8dee153fe204aa5d799e4ba44380c8483362ab4f7b149c715be6fa929345386b78af73ca6ae7e864dd2923e5c0de88404f8ffe5d22f2ae9238bcc074
24 DIST mutter-40.4.tar.xz 2682648 BLAKE2B fe3ed2edc20b4502db17bf3e6413159047eaa9812baa01b49f64ca2e3f05fe6f2e922a8e84ffd01636e8b6e5e31381653311153db5910f2dd1c84431d1892f6b SHA512 a38fe7c1ba2c65cb4510ee3ecd9b3e726cf3cb35922977e55f8b49f5ab847601277e1efaec63e7068ce0f924b38085adfe6d26b6d0af148a8f87400b31aba805
25 +DIST mutter-40.5.tar.xz 2682916 BLAKE2B 9ba2eeb5962a5473804fab02b1209c6044b151a1bc64b533762a27e91f6701a0ad655f582c8831cf92defc7be82e9eaa2c72b772fe7ea5e032dab5ecc96fb1b1 SHA512 ebd4f2bc4e8eef99d66305347673cbd2e38c5a058eb91eab6b932671ea7cb4a2f893dd65c4c5028ece454f8dd293898821bd125b68e304cf905ad237abff8837
26
27 diff --git a/x11-wm/mutter/mutter-40.5.ebuild b/x11-wm/mutter/mutter-40.5.ebuild
28 new file mode 100644
29 index 00000000000..34e1e065834
30 --- /dev/null
31 +++ b/x11-wm/mutter/mutter-40.5.ebuild
32 @@ -0,0 +1,167 @@
33 +# Copyright 1999-2021 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +inherit gnome.org gnome2-utils meson udev virtualx xdg
38 +
39 +DESCRIPTION="GNOME compositing window manager based on Clutter"
40 +HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
41 +
42 +LICENSE="GPL-2+"
43 +SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
44 +
45 +IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
46 +# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
47 +REQUIRED_USE="
48 + wayland? ( ^^ ( elogind systemd ) udev )
49 + test? ( wayland )"
50 +RESTRICT="!test? ( test )"
51 +
52 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
53 +
54 +# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
55 +# xorg-server is needed at build and runtime with USE=wayland for Xwayland
56 +# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
57 +DEPEND="
58 + >=x11-libs/libX11-1.7.0
59 + >=media-libs/graphene-1.10.2[introspection?]
60 + >=x11-libs/gtk+-3.19.8:3[X,introspection?]
61 + x11-libs/gdk-pixbuf:2
62 + >=x11-libs/pango-1.46[introspection?]
63 + >=dev-libs/fribidi-1.0.0
64 + >=x11-libs/cairo-1.14[X]
65 + >=gnome-base/gsettings-desktop-schemas-40.0[introspection?]
66 + >=dev-libs/glib-2.67.3:2
67 + gnome-base/gnome-settings-daemon
68 + >=dev-libs/json-glib-0.12.0[introspection?]
69 + gnome-base/gnome-desktop:3=
70 + >=x11-libs/libXcomposite-0.4
71 + x11-libs/libXcursor
72 + x11-libs/libXdamage
73 + x11-libs/libXext
74 + >=x11-libs/libXfixes-3
75 + >=x11-libs/libXi-1.7.4
76 + x11-libs/libXtst
77 + x11-libs/libxkbfile
78 + x11-misc/xkeyboard-config
79 + >=x11-libs/libxkbcommon-0.4.3[X]
80 + x11-libs/libXrender
81 + >=x11-libs/libXrandr-1.5.0
82 + x11-libs/libxcb
83 + x11-libs/libXinerama
84 + x11-libs/libXau
85 + x11-libs/libICE
86 + >=dev-libs/atk-2.5.3[introspection?]
87 + >=media-libs/libcanberra-0.26
88 + sys-apps/dbus
89 + media-libs/mesa[X(+),egl]
90 + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
91 + wayland? (
92 + >=dev-libs/wayland-protocols-1.19
93 + >=dev-libs/wayland-1.18.0
94 + x11-libs/libdrm:=
95 + >=media-libs/mesa-17.3[egl,gbm,wayland,gles2]
96 + >=dev-libs/libinput-1.15.0
97 + systemd? ( sys-apps/systemd )
98 + elogind? ( sys-auth/elogind )
99 + x11-base/xwayland
100 + video_cards_nvidia? ( gui-libs/egl-wayland )
101 + )
102 + udev? ( >=dev-libs/libgudev-232:=
103 + >=virtual/libudev-232-r1:= )
104 + x11-libs/libSM
105 + input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
106 + >=x11-libs/startup-notification-0.7
107 + screencast? ( >=media-video/pipewire-0.3.21:0/0.3 )
108 + introspection? ( >=dev-libs/gobject-introspection-1.54:= )
109 +"
110 +RDEPEND="${DEPEND}
111 + gnome-extra/zenity
112 +"
113 +DEPEND="${DEPEND}
114 + x11-base/xorg-proto
115 + sysprof? ( >=dev-util/sysprof-common-3.38.0 )
116 +"
117 +# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary
118 +BDEPEND="
119 + dev-libs/wayland
120 + dev-util/gdbus-codegen
121 + dev-util/glib-utils
122 + >=sys-devel/gettext-0.19.8
123 + virtual/pkgconfig
124 + test? ( app-text/docbook-xml-dtd:4.5 )
125 + wayland? (
126 + >=sys-kernel/linux-headers-4.4
127 + || (
128 + x11-libs/libxcvt
129 + <x11-base/xorg-server-1.20.11-r3[xorg,-minimal]
130 + )
131 + )
132 +"
133 +
134 +PATCHES=(
135 + "${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch
136 +)
137 +
138 +src_configure() {
139 + # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
140 + local emesonargs=(
141 + -Dopengl=true
142 + #opengl_libname
143 + #gles2_libname
144 + $(meson_use wayland gles2)
145 + -Degl=true
146 + -Dglx=true
147 + $(meson_use wayland)
148 + $(meson_use wayland native_backend)
149 + $(meson_use screencast remote_desktop)
150 + $(meson_use udev)
151 + -Dudev_dir=$(get_udevdir)
152 + $(meson_use input_devices_wacom libwacom)
153 + -Dpango_ft2=true
154 + -Dstartup_notification=true
155 + -Dsm=true
156 + $(meson_use introspection)
157 + $(meson_use test cogl_tests)
158 + $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
159 + -Dnative_tests=false
160 + $(meson_use test clutter_tests)
161 + $(meson_use test tests)
162 + $(meson_use sysprof profiler)
163 + -Dinstalled_tests=false
164 + #verbose # Let upstream choose default for verbose mode
165 + #xwayland_path
166 + # 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)
167 + #xwayland_grab_default_access_rules
168 + )
169 +
170 + if use wayland && use video_cards_nvidia; then
171 + emesonargs+=(
172 + -Degl_device=true
173 + -Dwayland_eglstream=true
174 + )
175 + else
176 + emsonargs+=(
177 + -Degl_device=false
178 + -Dwayland_eglstream=false
179 + )
180 + fi
181 +
182 + meson_src_configure
183 +}
184 +
185 +src_test() {
186 + gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
187 + glib-compile-schemas "${BUILD_DIR}"/data
188 + GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
189 +}
190 +
191 +pkg_postinst() {
192 + xdg_pkg_postinst
193 + gnome2_schemas_update
194 +}
195 +
196 +pkg_postrm() {
197 + xdg_pkg_postrm
198 + gnome2_schemas_update
199 +}