1 |
commit: c0b78299ddff6fc4ca43107507da77a2d85640de |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 31 17:49:10 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 31 18:23:44 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b78299 |
7 |
|
8 |
x11-wm/mutter: Drop old versions |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
x11-wm/mutter/Manifest | 2 - |
13 |
.../mutter-40.0-Disable-anonymous-file-test.patch | 32 ---- |
14 |
x11-wm/mutter/mutter-41.4.ebuild | 168 ------------------- |
15 |
x11-wm/mutter/mutter-42.0-r1.ebuild | 184 --------------------- |
16 |
4 files changed, 386 deletions(-) |
17 |
|
18 |
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest |
19 |
index aa867df08985..e67a6fa1c769 100644 |
20 |
--- a/x11-wm/mutter/Manifest |
21 |
+++ b/x11-wm/mutter/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST mutter-41.4.tar.xz 2717012 BLAKE2B 2f9d144380072427c0ee65c1e3bb26e5caca76e0656f316459a77df09f9e8bda3ea9c17c6400d04abee9c7f82b36dbd035794cf31feef7ee4574ce308d627e55 SHA512 ee3881f9047f0b9ef8598609e9ac90294cb36a7549fcc6a647a80553045ed315998d0dbac247887ae06b32126bab1525f13f7f92655b9103cac77750e347e405 |
24 |
-DIST mutter-42.0.tar.xz 2742212 BLAKE2B 4867d184fbf63f7624c907f941f1aa1ac8d66108554385c1500b6259958a3c2bf5dcd30cebed95cbafd4a1bbd5368b6078edec695884a0ee9eb48dbf0ad4cecf SHA512 ffcfbb1b6d3add84adf2d67d459905d164dc272289b645994288c376bc656481526d445cdfe6df027b88ab590258ee9d9d4ba251e03c6ef93d17f0758f75520d |
25 |
DIST mutter-42.1.tar.xz 2747056 BLAKE2B 7973e6178e3a61078c37c593a8ffabbd002b791b8251fdf9aa7c90b40efa76591f9946cdd31dd6f274c2a4455157c8661d63714619f3966250eeca5ddae34689 SHA512 b7c7011f1c3c4361ddfdcffc61057f8821c37cfb602d7f7ec97fdd1f0ab19dd331f396ca4f61c83253d003d1d866b0d2ff1e7f34bbc9e98b48aacb973aabd6d5 |
26 |
DIST mutter-42.2.tar.xz 2747612 BLAKE2B 39d83283dc04473e47263d463849030c1076bb5b8d6fbc37f03e1936cb999ab554784f02ad9a04cdbfa2f35ad95c74c0899ee44e9710e435e66de613628cc683 SHA512 e43bdc7c9183b2578ae1f777fdf84bfde550a26bfc28fd4a1a183c7f310d852110f3dcabd50a2fabdafba4cfb8aa6577aec4c65775075f0afff7bd1bb4dde957 |
27 |
|
28 |
diff --git a/x11-wm/mutter/files/mutter-40.0-Disable-anonymous-file-test.patch b/x11-wm/mutter/files/mutter-40.0-Disable-anonymous-file-test.patch |
29 |
deleted file mode 100644 |
30 |
index 484c62c5a0c4..000000000000 |
31 |
--- a/x11-wm/mutter/files/mutter-40.0-Disable-anonymous-file-test.patch |
32 |
+++ /dev/null |
33 |
@@ -1,32 +0,0 @@ |
34 |
-From 7353efd2f326b3f855db52ba8643ac4e793d5ffc Mon Sep 17 00:00:00 2001 |
35 |
-From: Matt Turner <mattst88@×××××.com> |
36 |
-Date: Sun, 21 Mar 2021 18:31:22 -0400 |
37 |
-Subject: [PATCH] Disable anonymous-file test |
38 |
- |
39 |
-It attempts to open /proc/self/fd/* (an fd created by memfd_create), |
40 |
-which sandbox disallows. |
41 |
---- |
42 |
- src/tests/meson.build | 7 ------- |
43 |
- 1 file changed, 7 deletions(-) |
44 |
- |
45 |
-diff --git a/src/tests/meson.build b/src/tests/meson.build |
46 |
-index 8ee409e20..50c930c2a 100644 |
47 |
---- a/src/tests/meson.build |
48 |
-+++ b/src/tests/meson.build |
49 |
-@@ -285,13 +285,6 @@ test('stage-view', stage_view_tests, |
50 |
- timeout: 60, |
51 |
- ) |
52 |
- |
53 |
--test('anonymous-file', anonymous_file_test, |
54 |
-- suite: ['core', 'mutter/unit'], |
55 |
-- env: test_env, |
56 |
-- is_parallel: false, |
57 |
-- timeout: 60, |
58 |
--) |
59 |
-- |
60 |
- if have_native_tests |
61 |
- test('native-headless', native_headless_tests, |
62 |
- suite: ['core', 'mutter/native/headless'], |
63 |
--- |
64 |
-2.26.2 |
65 |
- |
66 |
|
67 |
diff --git a/x11-wm/mutter/mutter-41.4.ebuild b/x11-wm/mutter/mutter-41.4.ebuild |
68 |
deleted file mode 100644 |
69 |
index e32a368da43b..000000000000 |
70 |
--- a/x11-wm/mutter/mutter-41.4.ebuild |
71 |
+++ /dev/null |
72 |
@@ -1,168 +0,0 @@ |
73 |
-# Copyright 1999-2022 Gentoo Authors |
74 |
-# Distributed under the terms of the GNU General Public License v2 |
75 |
- |
76 |
-EAPI=7 |
77 |
-inherit gnome.org gnome2-utils meson udev xdg |
78 |
- |
79 |
-DESCRIPTION="GNOME compositing window manager based on Clutter" |
80 |
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" |
81 |
- |
82 |
-LICENSE="GPL-2+" |
83 |
-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 |
84 |
- |
85 |
-IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" |
86 |
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider |
87 |
-REQUIRED_USE=" |
88 |
- wayland? ( ^^ ( elogind systemd ) udev ) |
89 |
- test? ( wayland )" |
90 |
-RESTRICT="!test? ( test )" |
91 |
- |
92 |
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" |
93 |
- |
94 |
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema |
95 |
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland |
96 |
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order |
97 |
-DEPEND=" |
98 |
- >=x11-libs/libX11-1.7.0 |
99 |
- >=media-libs/graphene-1.10.2[introspection?] |
100 |
- >=x11-libs/gtk+-3.19.8:3[X,introspection?] |
101 |
- x11-libs/gdk-pixbuf:2 |
102 |
- >=x11-libs/pango-1.46[introspection?] |
103 |
- >=dev-libs/fribidi-1.0.0 |
104 |
- >=x11-libs/cairo-1.14[X] |
105 |
- >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] |
106 |
- >=dev-libs/glib-2.69.0:2 |
107 |
- gnome-base/gnome-settings-daemon |
108 |
- >=dev-libs/json-glib-0.12.0[introspection?] |
109 |
- gnome-base/gnome-desktop:3= |
110 |
- >=x11-libs/libXcomposite-0.4 |
111 |
- x11-libs/libXcursor |
112 |
- x11-libs/libXdamage |
113 |
- x11-libs/libXext |
114 |
- >=x11-libs/libXfixes-3 |
115 |
- >=x11-libs/libXi-1.7.4 |
116 |
- x11-libs/libXtst |
117 |
- x11-libs/libxkbfile |
118 |
- x11-misc/xkeyboard-config |
119 |
- >=x11-libs/libxkbcommon-0.4.3[X] |
120 |
- x11-libs/libXrender |
121 |
- >=x11-libs/libXrandr-1.5.0 |
122 |
- x11-libs/libxcb |
123 |
- x11-libs/libXinerama |
124 |
- x11-libs/libXau |
125 |
- x11-libs/libICE |
126 |
- >=dev-libs/atk-2.5.3[introspection?] |
127 |
- >=media-libs/libcanberra-0.26 |
128 |
- sys-apps/dbus |
129 |
- media-libs/mesa[X(+),egl(+)] |
130 |
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) |
131 |
- systemd? ( sys-apps/systemd ) |
132 |
- wayland? ( |
133 |
- >=dev-libs/wayland-protocols-1.21 |
134 |
- >=dev-libs/wayland-1.18.0 |
135 |
- x11-libs/libdrm:= |
136 |
- >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] |
137 |
- >=dev-libs/libinput-1.18.0 |
138 |
- elogind? ( sys-auth/elogind ) |
139 |
- x11-base/xwayland |
140 |
- video_cards_nvidia? ( gui-libs/egl-wayland ) |
141 |
- ) |
142 |
- udev? ( >=dev-libs/libgudev-232:= |
143 |
- >=virtual/libudev-232-r1:= ) |
144 |
- x11-libs/libSM |
145 |
- input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) |
146 |
- >=x11-libs/startup-notification-0.7 |
147 |
- screencast? ( >=media-video/pipewire-0.3.21:= ) |
148 |
- introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
149 |
-" |
150 |
-RDEPEND="${DEPEND} |
151 |
- gnome-extra/zenity |
152 |
-" |
153 |
-DEPEND="${DEPEND} |
154 |
- x11-base/xorg-proto |
155 |
- sysprof? ( >=dev-util/sysprof-common-3.38.0 ) |
156 |
-" |
157 |
-# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary |
158 |
-BDEPEND=" |
159 |
- dev-libs/wayland |
160 |
- dev-util/gdbus-codegen |
161 |
- dev-util/glib-utils |
162 |
- >=sys-devel/gettext-0.19.8 |
163 |
- virtual/pkgconfig |
164 |
- test? ( |
165 |
- app-text/docbook-xml-dtd:4.5 |
166 |
- x11-misc/xvfb-run |
167 |
- ) |
168 |
- wayland? ( |
169 |
- >=sys-kernel/linux-headers-4.4 |
170 |
- x11-libs/libxcvt |
171 |
- ) |
172 |
-" |
173 |
- |
174 |
-PATCHES=( |
175 |
- "${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch |
176 |
-) |
177 |
- |
178 |
-src_configure() { |
179 |
- # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain |
180 |
- local emesonargs=( |
181 |
- -Dopengl=true |
182 |
- #opengl_libname |
183 |
- #gles2_libname |
184 |
- $(meson_use wayland gles2) |
185 |
- -Degl=true |
186 |
- -Dglx=true |
187 |
- $(meson_use wayland) |
188 |
- $(meson_use systemd) |
189 |
- $(meson_use wayland native_backend) |
190 |
- $(meson_use screencast remote_desktop) |
191 |
- $(meson_use udev) |
192 |
- -Dudev_dir=$(get_udevdir) |
193 |
- $(meson_use input_devices_wacom libwacom) |
194 |
- -Dpango_ft2=true |
195 |
- -Dstartup_notification=true |
196 |
- -Dsm=true |
197 |
- $(meson_use introspection) |
198 |
- $(meson_use test cogl_tests) |
199 |
- $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed |
200 |
- -Dnative_tests=false |
201 |
- $(meson_use test clutter_tests) |
202 |
- $(meson_use test tests) |
203 |
- $(meson_use sysprof profiler) |
204 |
- -Dinstalled_tests=false |
205 |
- #verbose # Let upstream choose default for verbose mode |
206 |
- #xwayland_path |
207 |
- # 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) |
208 |
- #xwayland_grab_default_access_rules |
209 |
- ) |
210 |
- |
211 |
- if use wayland && use video_cards_nvidia; then |
212 |
- emesonargs+=( |
213 |
- -Degl_device=true |
214 |
- -Dwayland_eglstream=true |
215 |
- ) |
216 |
- else |
217 |
- emesonargs+=( |
218 |
- -Degl_device=false |
219 |
- -Dwayland_eglstream=false |
220 |
- ) |
221 |
- fi |
222 |
- |
223 |
- meson_src_configure |
224 |
-} |
225 |
- |
226 |
-src_test() { |
227 |
- gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed |
228 |
- glib-compile-schemas "${BUILD_DIR}"/data |
229 |
- GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI |
230 |
-} |
231 |
- |
232 |
-pkg_postinst() { |
233 |
- xdg_pkg_postinst |
234 |
- gnome2_schemas_update |
235 |
-} |
236 |
- |
237 |
-pkg_postrm() { |
238 |
- xdg_pkg_postrm |
239 |
- gnome2_schemas_update |
240 |
-} |
241 |
|
242 |
diff --git a/x11-wm/mutter/mutter-42.0-r1.ebuild b/x11-wm/mutter/mutter-42.0-r1.ebuild |
243 |
deleted file mode 100644 |
244 |
index 64c4d9748678..000000000000 |
245 |
--- a/x11-wm/mutter/mutter-42.0-r1.ebuild |
246 |
+++ /dev/null |
247 |
@@ -1,184 +0,0 @@ |
248 |
-# Copyright 1999-2022 Gentoo Authors |
249 |
-# Distributed under the terms of the GNU General Public License v2 |
250 |
- |
251 |
-EAPI=7 |
252 |
-PYTHON_COMPAT=( python3_{8..10} ) |
253 |
-inherit gnome.org gnome2-utils meson python-any-r1 udev xdg |
254 |
- |
255 |
-DESCRIPTION="GNOME compositing window manager based on Clutter" |
256 |
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" |
257 |
- |
258 |
-LICENSE="GPL-2+" |
259 |
-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 |
260 |
- |
261 |
-IUSE="doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" |
262 |
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider |
263 |
-REQUIRED_USE=" |
264 |
- wayland? ( ^^ ( elogind systemd ) udev ) |
265 |
- test? ( wayland )" |
266 |
-RESTRICT="!test? ( test )" |
267 |
- |
268 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
269 |
- |
270 |
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema |
271 |
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland |
272 |
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order |
273 |
-DEPEND=" |
274 |
- >=x11-libs/libX11-1.7.0 |
275 |
- >=media-libs/graphene-1.10.2[introspection?] |
276 |
- >=x11-libs/gtk+-3.19.8:3[X,introspection?] |
277 |
- x11-libs/gdk-pixbuf:2 |
278 |
- >=x11-libs/pango-1.46[introspection?] |
279 |
- >=dev-libs/fribidi-1.0.0 |
280 |
- >=x11-libs/cairo-1.14[X] |
281 |
- >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] |
282 |
- >=dev-libs/glib-2.69.0:2 |
283 |
- gnome-base/gnome-settings-daemon |
284 |
- >=dev-libs/json-glib-0.12.0[introspection?] |
285 |
- >=x11-libs/libXcomposite-0.4 |
286 |
- x11-libs/libXcursor |
287 |
- x11-libs/libXdamage |
288 |
- x11-libs/libXext |
289 |
- >=x11-libs/libXfixes-3 |
290 |
- >=x11-libs/libXi-1.7.4 |
291 |
- x11-libs/libXtst |
292 |
- x11-libs/libxkbfile |
293 |
- x11-misc/xkeyboard-config |
294 |
- >=x11-libs/libxkbcommon-0.4.3[X] |
295 |
- x11-libs/libXrender |
296 |
- >=x11-libs/libXrandr-1.5.0 |
297 |
- x11-libs/libxcb |
298 |
- x11-libs/libXinerama |
299 |
- x11-libs/libXau |
300 |
- x11-libs/libICE |
301 |
- >=dev-libs/atk-2.5.3[introspection?] |
302 |
- >=media-libs/libcanberra-0.26 |
303 |
- sys-apps/dbus |
304 |
- gnome? ( gnome-base/gnome-desktop:3= ) |
305 |
- media-libs/mesa[X(+),egl(+)] |
306 |
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) |
307 |
- systemd? ( sys-apps/systemd ) |
308 |
- wayland? ( |
309 |
- >=dev-libs/wayland-protocols-1.21 |
310 |
- >=dev-libs/wayland-1.18.0 |
311 |
- x11-libs/libdrm:= |
312 |
- >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] |
313 |
- >=dev-libs/libinput-1.18.0 |
314 |
- elogind? ( sys-auth/elogind ) |
315 |
- x11-base/xwayland |
316 |
- video_cards_nvidia? ( gui-libs/egl-wayland ) |
317 |
- ) |
318 |
- udev? ( >=dev-libs/libgudev-232:= |
319 |
- >=virtual/libudev-232-r1:= ) |
320 |
- x11-libs/libSM |
321 |
- input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) |
322 |
- >=x11-libs/startup-notification-0.7 |
323 |
- screencast? ( >=media-video/pipewire-0.3.21:= ) |
324 |
- introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
325 |
- doc? ( >=dev-util/gi-docgen-2021.1 ) |
326 |
-" |
327 |
-RDEPEND="${DEPEND} |
328 |
- gnome-extra/zenity |
329 |
-" |
330 |
-DEPEND="${DEPEND} |
331 |
- x11-base/xorg-proto |
332 |
- sysprof? ( >=dev-util/sysprof-common-3.38.0 ) |
333 |
-" |
334 |
-# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary |
335 |
-BDEPEND=" |
336 |
- dev-libs/wayland |
337 |
- dev-util/gdbus-codegen |
338 |
- dev-util/glib-utils |
339 |
- >=sys-devel/gettext-0.19.8 |
340 |
- virtual/pkgconfig |
341 |
- test? ( |
342 |
- ${PYTHON_DEPS} |
343 |
- $(python_gen_any_dep ' |
344 |
- dev-python/python-dbusmock[${PYTHON_USEDEP}] |
345 |
- ') |
346 |
- app-text/docbook-xml-dtd:4.5 |
347 |
- x11-misc/xvfb-run |
348 |
- ) |
349 |
- wayland? ( |
350 |
- >=sys-kernel/linux-headers-4.4 |
351 |
- x11-libs/libxcvt |
352 |
- ) |
353 |
-" |
354 |
- |
355 |
-PATCHES=( |
356 |
- "${FILESDIR}"/${PN}-42.0-Disable-anonymous-file-test.patch |
357 |
-) |
358 |
- |
359 |
-python_check_deps() { |
360 |
- if use test; then |
361 |
- has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" |
362 |
- fi |
363 |
-} |
364 |
- |
365 |
-src_configure() { |
366 |
- # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain |
367 |
- local emesonargs=( |
368 |
- -Dopengl=true |
369 |
- #opengl_libname |
370 |
- #gles2_libname |
371 |
- $(meson_use wayland gles2) |
372 |
- -Degl=true |
373 |
- -Dglx=true |
374 |
- $(meson_use wayland) |
375 |
- $(meson_use systemd) |
376 |
- $(meson_use wayland native_backend) |
377 |
- $(meson_use screencast remote_desktop) |
378 |
- -Dlibgnome_desktop=true |
379 |
- $(meson_use udev) |
380 |
- -Dudev_dir=$(get_udevdir) |
381 |
- $(meson_use input_devices_wacom libwacom) |
382 |
- -Dpango_ft2=true |
383 |
- -Dstartup_notification=true |
384 |
- -Dsm=true |
385 |
- $(meson_use introspection) |
386 |
- $(meson_use doc docs) |
387 |
- $(meson_use test cogl_tests) |
388 |
- $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed |
389 |
- -Dnative_tests=false |
390 |
- $(meson_use test clutter_tests) |
391 |
- $(meson_use test tests) |
392 |
- -Dkvm_tests=false |
393 |
- -Dtty_tests=false |
394 |
- $(meson_use sysprof profiler) |
395 |
- -Dinstalled_tests=false |
396 |
- #verbose # Let upstream choose default for verbose mode |
397 |
- #xwayland_path |
398 |
- # 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) |
399 |
- #xwayland_grab_default_access_rules |
400 |
- ) |
401 |
- |
402 |
- if use wayland && use video_cards_nvidia; then |
403 |
- emesonargs+=( |
404 |
- -Degl_device=true |
405 |
- -Dwayland_eglstream=true |
406 |
- ) |
407 |
- else |
408 |
- emesonargs+=( |
409 |
- -Degl_device=false |
410 |
- -Dwayland_eglstream=false |
411 |
- ) |
412 |
- fi |
413 |
- |
414 |
- meson_src_configure |
415 |
-} |
416 |
- |
417 |
-src_test() { |
418 |
- gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed |
419 |
- glib-compile-schemas "${BUILD_DIR}"/data |
420 |
- GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI |
421 |
-} |
422 |
- |
423 |
-pkg_postinst() { |
424 |
- xdg_pkg_postinst |
425 |
- gnome2_schemas_update |
426 |
-} |
427 |
- |
428 |
-pkg_postrm() { |
429 |
- xdg_pkg_postrm |
430 |
- gnome2_schemas_update |
431 |
-} |