1 |
commit: 1e84d5efce0fe34e7e40fbbb45b84f1ecaf94156 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 24 21:19:51 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 24 22:42:58 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e84d5ef |
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 |
x11-wm/mutter/mutter-40.4-r3.ebuild | 164 ----------------------------------- |
14 |
x11-wm/mutter/mutter-41.2-r1.ebuild | 168 ------------------------------------ |
15 |
3 files changed, 334 deletions(-) |
16 |
|
17 |
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest |
18 |
index 49f91db59632..4688034a0c2a 100644 |
19 |
--- a/x11-wm/mutter/Manifest |
20 |
+++ b/x11-wm/mutter/Manifest |
21 |
@@ -1,5 +1,3 @@ |
22 |
-DIST mutter-40.4.tar.xz 2682648 BLAKE2B fe3ed2edc20b4502db17bf3e6413159047eaa9812baa01b49f64ca2e3f05fe6f2e922a8e84ffd01636e8b6e5e31381653311153db5910f2dd1c84431d1892f6b SHA512 a38fe7c1ba2c65cb4510ee3ecd9b3e726cf3cb35922977e55f8b49f5ab847601277e1efaec63e7068ce0f924b38085adfe6d26b6d0af148a8f87400b31aba805 |
23 |
DIST mutter-40.5-r1-patchset.tar.xz 5568 BLAKE2B 3e1cc6a8cb0a792a4abedaaa1f856eae679acf17be8fa5be6c4bf764924d89950c8fcd264859049fcf326ed94e2b4d74433bbee16acf06bb0e180674a9d3a2c2 SHA512 8da4f92b2268a6966d468cd15063fb361a71299aff671203141225e74d5655ee1cb4f4e2f1922e06355c3f3b756638f3a2243ecafeb30273e3ff04897b6a23d8 |
24 |
DIST mutter-40.5.tar.xz 2682916 BLAKE2B 9ba2eeb5962a5473804fab02b1209c6044b151a1bc64b533762a27e91f6701a0ad655f582c8831cf92defc7be82e9eaa2c72b772fe7ea5e032dab5ecc96fb1b1 SHA512 ebd4f2bc4e8eef99d66305347673cbd2e38c5a058eb91eab6b932671ea7cb4a2f893dd65c4c5028ece454f8dd293898821bd125b68e304cf905ad237abff8837 |
25 |
-DIST mutter-41.2.tar.xz 2713924 BLAKE2B 271b5cd3eebf3b3c040876dc634d5316788ee566fece2ded6987e048d03ea8b4b4c76b482ca91e1eaf5cdcdf36294948b2ab902013874f100247dfb5b04a4cbb SHA512 9fd030e2c3e5956e4e7412ac36069ab0e81798688b0a4f2372d935f81190ae8fb383919b2c29b8af37e5eeea47d250647ce8466d7f2e9047edf60e1ca93a9e3c |
26 |
DIST mutter-41.3.tar.xz 2717692 BLAKE2B c31fa8c5e110b243dc9ce0a96d4ea28670adec27d519788de6d826bcb858eda9df209eb02c08a07e2fa3a16fb8a2a2e8bce1025721c43a1f96b062980b924dbe SHA512 daa0cc8d91f8f3a35d2e2218c1e8d1f9e7f57df95a209f4b87ba8f3f81284ad45aa5000d08a148ae6d408f60d7ff120565e9132e1a84c3b6f55f9e59d6585338 |
27 |
|
28 |
diff --git a/x11-wm/mutter/mutter-40.4-r3.ebuild b/x11-wm/mutter/mutter-40.4-r3.ebuild |
29 |
deleted file mode 100644 |
30 |
index 94dd02db647d..000000000000 |
31 |
--- a/x11-wm/mutter/mutter-40.4-r3.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,164 +0,0 @@ |
34 |
-# Copyright 1999-2021 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
-inherit gnome.org gnome2-utils meson udev virtualx xdg |
39 |
- |
40 |
-DESCRIPTION="GNOME compositing window manager based on Clutter" |
41 |
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" |
42 |
- |
43 |
-LICENSE="GPL-2+" |
44 |
-SLOT="0/8" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot |
45 |
- |
46 |
-IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" |
47 |
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider |
48 |
-REQUIRED_USE=" |
49 |
- wayland? ( ^^ ( elogind systemd ) udev ) |
50 |
- test? ( wayland )" |
51 |
-RESTRICT="!test? ( test )" |
52 |
- |
53 |
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" |
54 |
- |
55 |
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema |
56 |
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland |
57 |
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order |
58 |
-DEPEND=" |
59 |
- >=x11-libs/libX11-1.7.0 |
60 |
- >=media-libs/graphene-1.10.2[introspection?] |
61 |
- >=x11-libs/gtk+-3.19.8:3[X,introspection?] |
62 |
- x11-libs/gdk-pixbuf:2 |
63 |
- >=x11-libs/pango-1.46[introspection?] |
64 |
- >=dev-libs/fribidi-1.0.0 |
65 |
- >=x11-libs/cairo-1.14[X] |
66 |
- >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] |
67 |
- >=dev-libs/glib-2.67.3:2 |
68 |
- gnome-base/gnome-settings-daemon |
69 |
- >=dev-libs/json-glib-0.12.0[introspection?] |
70 |
- gnome-base/gnome-desktop:3= |
71 |
- >=x11-libs/libXcomposite-0.4 |
72 |
- x11-libs/libXcursor |
73 |
- x11-libs/libXdamage |
74 |
- x11-libs/libXext |
75 |
- >=x11-libs/libXfixes-3 |
76 |
- >=x11-libs/libXi-1.7.4 |
77 |
- x11-libs/libXtst |
78 |
- x11-libs/libxkbfile |
79 |
- x11-misc/xkeyboard-config |
80 |
- >=x11-libs/libxkbcommon-0.4.3[X] |
81 |
- x11-libs/libXrender |
82 |
- >=x11-libs/libXrandr-1.5.0 |
83 |
- x11-libs/libxcb |
84 |
- x11-libs/libXinerama |
85 |
- x11-libs/libXau |
86 |
- x11-libs/libICE |
87 |
- >=dev-libs/atk-2.5.3[introspection?] |
88 |
- >=media-libs/libcanberra-0.26 |
89 |
- sys-apps/dbus |
90 |
- media-libs/mesa[X(+),egl(+)] |
91 |
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) |
92 |
- wayland? ( |
93 |
- >=dev-libs/wayland-protocols-1.19 |
94 |
- >=dev-libs/wayland-1.18.0 |
95 |
- x11-libs/libdrm:= |
96 |
- >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] |
97 |
- >=dev-libs/libinput-1.15.0 |
98 |
- systemd? ( sys-apps/systemd ) |
99 |
- elogind? ( sys-auth/elogind ) |
100 |
- x11-base/xwayland |
101 |
- video_cards_nvidia? ( gui-libs/egl-wayland ) |
102 |
- ) |
103 |
- udev? ( >=dev-libs/libgudev-232:= |
104 |
- >=virtual/libudev-232-r1:= ) |
105 |
- x11-libs/libSM |
106 |
- input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) |
107 |
- >=x11-libs/startup-notification-0.7 |
108 |
- screencast? ( >=media-video/pipewire-0.3.21:= ) |
109 |
- introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
110 |
-" |
111 |
-RDEPEND="${DEPEND} |
112 |
- gnome-extra/zenity |
113 |
-" |
114 |
-DEPEND="${DEPEND} |
115 |
- x11-base/xorg-proto |
116 |
- sysprof? ( >=dev-util/sysprof-common-3.38.0 ) |
117 |
-" |
118 |
-# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary |
119 |
-BDEPEND=" |
120 |
- dev-libs/wayland |
121 |
- dev-util/gdbus-codegen |
122 |
- dev-util/glib-utils |
123 |
- >=sys-devel/gettext-0.19.8 |
124 |
- virtual/pkgconfig |
125 |
- test? ( app-text/docbook-xml-dtd:4.5 ) |
126 |
- wayland? ( |
127 |
- >=sys-kernel/linux-headers-4.4 |
128 |
- x11-libs/libxcvt |
129 |
- ) |
130 |
-" |
131 |
- |
132 |
-PATCHES=( |
133 |
- "${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch |
134 |
-) |
135 |
- |
136 |
-src_configure() { |
137 |
- # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain |
138 |
- local emesonargs=( |
139 |
- -Dopengl=true |
140 |
- #opengl_libname |
141 |
- #gles2_libname |
142 |
- $(meson_use wayland gles2) |
143 |
- -Degl=true |
144 |
- -Dglx=true |
145 |
- $(meson_use wayland) |
146 |
- $(meson_use wayland native_backend) |
147 |
- $(meson_use screencast remote_desktop) |
148 |
- $(meson_use udev) |
149 |
- -Dudev_dir=$(get_udevdir) |
150 |
- $(meson_use input_devices_wacom libwacom) |
151 |
- -Dpango_ft2=true |
152 |
- -Dstartup_notification=true |
153 |
- -Dsm=true |
154 |
- $(meson_use introspection) |
155 |
- $(meson_use test cogl_tests) |
156 |
- $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed |
157 |
- -Dnative_tests=false |
158 |
- $(meson_use test clutter_tests) |
159 |
- $(meson_use test tests) |
160 |
- $(meson_use sysprof profiler) |
161 |
- -Dinstalled_tests=false |
162 |
- #verbose # Let upstream choose default for verbose mode |
163 |
- #xwayland_path |
164 |
- # 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) |
165 |
- #xwayland_grab_default_access_rules |
166 |
- ) |
167 |
- |
168 |
- if use wayland && use video_cards_nvidia; then |
169 |
- emesonargs+=( |
170 |
- -Degl_device=true |
171 |
- -Dwayland_eglstream=true |
172 |
- ) |
173 |
- else |
174 |
- emsonargs+=( |
175 |
- -Degl_device=false |
176 |
- -Dwayland_eglstream=false |
177 |
- ) |
178 |
- fi |
179 |
- |
180 |
- meson_src_configure |
181 |
-} |
182 |
- |
183 |
-src_test() { |
184 |
- gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed |
185 |
- glib-compile-schemas "${BUILD_DIR}"/data |
186 |
- GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test |
187 |
-} |
188 |
- |
189 |
-pkg_postinst() { |
190 |
- xdg_pkg_postinst |
191 |
- gnome2_schemas_update |
192 |
-} |
193 |
- |
194 |
-pkg_postrm() { |
195 |
- xdg_pkg_postrm |
196 |
- gnome2_schemas_update |
197 |
-} |
198 |
|
199 |
diff --git a/x11-wm/mutter/mutter-41.2-r1.ebuild b/x11-wm/mutter/mutter-41.2-r1.ebuild |
200 |
deleted file mode 100644 |
201 |
index b05673366a97..000000000000 |
202 |
--- a/x11-wm/mutter/mutter-41.2-r1.ebuild |
203 |
+++ /dev/null |
204 |
@@ -1,168 +0,0 @@ |
205 |
-# Copyright 1999-2021 Gentoo Authors |
206 |
-# Distributed under the terms of the GNU General Public License v2 |
207 |
- |
208 |
-EAPI=7 |
209 |
-inherit gnome.org gnome2-utils meson udev xdg |
210 |
- |
211 |
-DESCRIPTION="GNOME compositing window manager based on Clutter" |
212 |
-HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" |
213 |
- |
214 |
-LICENSE="GPL-2+" |
215 |
-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 |
216 |
- |
217 |
-IUSE="elogind input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" |
218 |
-# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider |
219 |
-REQUIRED_USE=" |
220 |
- wayland? ( ^^ ( elogind systemd ) udev ) |
221 |
- test? ( wayland )" |
222 |
-RESTRICT="!test? ( test )" |
223 |
- |
224 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
225 |
- |
226 |
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema |
227 |
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland |
228 |
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order |
229 |
-DEPEND=" |
230 |
- >=x11-libs/libX11-1.7.0 |
231 |
- >=media-libs/graphene-1.10.2[introspection?] |
232 |
- >=x11-libs/gtk+-3.19.8:3[X,introspection?] |
233 |
- x11-libs/gdk-pixbuf:2 |
234 |
- >=x11-libs/pango-1.46[introspection?] |
235 |
- >=dev-libs/fribidi-1.0.0 |
236 |
- >=x11-libs/cairo-1.14[X] |
237 |
- >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] |
238 |
- >=dev-libs/glib-2.69.0:2 |
239 |
- gnome-base/gnome-settings-daemon |
240 |
- >=dev-libs/json-glib-0.12.0[introspection?] |
241 |
- gnome-base/gnome-desktop:3= |
242 |
- >=x11-libs/libXcomposite-0.4 |
243 |
- x11-libs/libXcursor |
244 |
- x11-libs/libXdamage |
245 |
- x11-libs/libXext |
246 |
- >=x11-libs/libXfixes-3 |
247 |
- >=x11-libs/libXi-1.7.4 |
248 |
- x11-libs/libXtst |
249 |
- x11-libs/libxkbfile |
250 |
- x11-misc/xkeyboard-config |
251 |
- >=x11-libs/libxkbcommon-0.4.3[X] |
252 |
- x11-libs/libXrender |
253 |
- >=x11-libs/libXrandr-1.5.0 |
254 |
- x11-libs/libxcb |
255 |
- x11-libs/libXinerama |
256 |
- x11-libs/libXau |
257 |
- x11-libs/libICE |
258 |
- >=dev-libs/atk-2.5.3[introspection?] |
259 |
- >=media-libs/libcanberra-0.26 |
260 |
- sys-apps/dbus |
261 |
- media-libs/mesa[X(+),egl(+)] |
262 |
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) |
263 |
- systemd? ( sys-apps/systemd ) |
264 |
- wayland? ( |
265 |
- >=dev-libs/wayland-protocols-1.21 |
266 |
- >=dev-libs/wayland-1.18.0 |
267 |
- x11-libs/libdrm:= |
268 |
- >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] |
269 |
- >=dev-libs/libinput-1.18.0 |
270 |
- elogind? ( sys-auth/elogind ) |
271 |
- x11-base/xwayland |
272 |
- video_cards_nvidia? ( gui-libs/egl-wayland ) |
273 |
- ) |
274 |
- udev? ( >=dev-libs/libgudev-232:= |
275 |
- >=virtual/libudev-232-r1:= ) |
276 |
- x11-libs/libSM |
277 |
- input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) |
278 |
- >=x11-libs/startup-notification-0.7 |
279 |
- screencast? ( >=media-video/pipewire-0.3.21:= ) |
280 |
- introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
281 |
-" |
282 |
-RDEPEND="${DEPEND} |
283 |
- gnome-extra/zenity |
284 |
-" |
285 |
-DEPEND="${DEPEND} |
286 |
- x11-base/xorg-proto |
287 |
- sysprof? ( >=dev-util/sysprof-common-3.38.0 ) |
288 |
-" |
289 |
-# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary |
290 |
-BDEPEND=" |
291 |
- dev-libs/wayland |
292 |
- dev-util/gdbus-codegen |
293 |
- dev-util/glib-utils |
294 |
- >=sys-devel/gettext-0.19.8 |
295 |
- virtual/pkgconfig |
296 |
- test? ( |
297 |
- app-text/docbook-xml-dtd:4.5 |
298 |
- x11-misc/xvfb-run |
299 |
- ) |
300 |
- wayland? ( |
301 |
- >=sys-kernel/linux-headers-4.4 |
302 |
- x11-libs/libxcvt |
303 |
- ) |
304 |
-" |
305 |
- |
306 |
-PATCHES=( |
307 |
- "${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch |
308 |
-) |
309 |
- |
310 |
-src_configure() { |
311 |
- # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain |
312 |
- local emesonargs=( |
313 |
- -Dopengl=true |
314 |
- #opengl_libname |
315 |
- #gles2_libname |
316 |
- $(meson_use wayland gles2) |
317 |
- -Degl=true |
318 |
- -Dglx=true |
319 |
- $(meson_use wayland) |
320 |
- $(meson_use systemd) |
321 |
- $(meson_use wayland native_backend) |
322 |
- $(meson_use screencast remote_desktop) |
323 |
- $(meson_use udev) |
324 |
- -Dudev_dir=$(get_udevdir) |
325 |
- $(meson_use input_devices_wacom libwacom) |
326 |
- -Dpango_ft2=true |
327 |
- -Dstartup_notification=true |
328 |
- -Dsm=true |
329 |
- $(meson_use introspection) |
330 |
- $(meson_use test cogl_tests) |
331 |
- $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed |
332 |
- -Dnative_tests=false |
333 |
- $(meson_use test clutter_tests) |
334 |
- $(meson_use test tests) |
335 |
- $(meson_use sysprof profiler) |
336 |
- -Dinstalled_tests=false |
337 |
- #verbose # Let upstream choose default for verbose mode |
338 |
- #xwayland_path |
339 |
- # 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) |
340 |
- #xwayland_grab_default_access_rules |
341 |
- ) |
342 |
- |
343 |
- if use wayland && use video_cards_nvidia; then |
344 |
- emesonargs+=( |
345 |
- -Degl_device=true |
346 |
- -Dwayland_eglstream=true |
347 |
- ) |
348 |
- else |
349 |
- emsonargs+=( |
350 |
- -Degl_device=false |
351 |
- -Dwayland_eglstream=false |
352 |
- ) |
353 |
- fi |
354 |
- |
355 |
- meson_src_configure |
356 |
-} |
357 |
- |
358 |
-src_test() { |
359 |
- gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed |
360 |
- glib-compile-schemas "${BUILD_DIR}"/data |
361 |
- GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI |
362 |
-} |
363 |
- |
364 |
-pkg_postinst() { |
365 |
- xdg_pkg_postinst |
366 |
- gnome2_schemas_update |
367 |
-} |
368 |
- |
369 |
-pkg_postrm() { |
370 |
- xdg_pkg_postrm |
371 |
- gnome2_schemas_update |
372 |
-} |