1 |
commit: e260f0d94fce18c4114933cf0671ffeb1e24feee |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 11 20:02:14 2022 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 11 20:41:45 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e260f0d9 |
7 |
|
8 |
x11-wm/mutter: remove old |
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-41.1-r1.ebuild | 168 ------------------------------------ |
15 |
2 files changed, 169 deletions(-) |
16 |
|
17 |
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest |
18 |
index 92472a4df584..49f91db59632 100644 |
19 |
--- a/x11-wm/mutter/Manifest |
20 |
+++ b/x11-wm/mutter/Manifest |
21 |
@@ -1,6 +1,5 @@ |
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.1.tar.xz 2712924 BLAKE2B 1b25f4a45be258f84ea29ccc85f4b70f228af9e2c6278edf0f2689436b33d320ae08b63f02736b59269ad9f4ac129d381a9c04e9118c58b6bb6f98512d744063 SHA512 797f857a6cc053e3639a002bc35f8431ed55bd887189f74f7b183bf9e54319dd66910c9d165826effffb9bec05ec7454ce21e4d0a78cb1a9d841c1eb37865d4e |
26 |
DIST mutter-41.2.tar.xz 2713924 BLAKE2B 271b5cd3eebf3b3c040876dc634d5316788ee566fece2ded6987e048d03ea8b4b4c76b482ca91e1eaf5cdcdf36294948b2ab902013874f100247dfb5b04a4cbb SHA512 9fd030e2c3e5956e4e7412ac36069ab0e81798688b0a4f2372d935f81190ae8fb383919b2c29b8af37e5eeea47d250647ce8466d7f2e9047edf60e1ca93a9e3c |
27 |
DIST mutter-41.3.tar.xz 2717692 BLAKE2B c31fa8c5e110b243dc9ce0a96d4ea28670adec27d519788de6d826bcb858eda9df209eb02c08a07e2fa3a16fb8a2a2e8bce1025721c43a1f96b062980b924dbe SHA512 daa0cc8d91f8f3a35d2e2218c1e8d1f9e7f57df95a209f4b87ba8f3f81284ad45aa5000d08a148ae6d408f60d7ff120565e9132e1a84c3b6f55f9e59d6585338 |
28 |
|
29 |
diff --git a/x11-wm/mutter/mutter-41.1-r1.ebuild b/x11-wm/mutter/mutter-41.1-r1.ebuild |
30 |
deleted file mode 100644 |
31 |
index b05673366a97..000000000000 |
32 |
--- a/x11-wm/mutter/mutter-41.1-r1.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,168 +0,0 @@ |
35 |
-# Copyright 1999-2021 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=7 |
39 |
-inherit gnome.org gnome2-utils meson 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="elogind 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 |
- wayland? ( ^^ ( elogind systemd ) udev ) |
51 |
- test? ( wayland )" |
52 |
-RESTRICT="!test? ( test )" |
53 |
- |
54 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
55 |
- |
56 |
-# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema |
57 |
-# xorg-server is needed at build and runtime with USE=wayland for Xwayland |
58 |
-# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order |
59 |
-DEPEND=" |
60 |
- >=x11-libs/libX11-1.7.0 |
61 |
- >=media-libs/graphene-1.10.2[introspection?] |
62 |
- >=x11-libs/gtk+-3.19.8:3[X,introspection?] |
63 |
- x11-libs/gdk-pixbuf:2 |
64 |
- >=x11-libs/pango-1.46[introspection?] |
65 |
- >=dev-libs/fribidi-1.0.0 |
66 |
- >=x11-libs/cairo-1.14[X] |
67 |
- >=gnome-base/gsettings-desktop-schemas-40.0[introspection?] |
68 |
- >=dev-libs/glib-2.69.0:2 |
69 |
- gnome-base/gnome-settings-daemon |
70 |
- >=dev-libs/json-glib-0.12.0[introspection?] |
71 |
- gnome-base/gnome-desktop:3= |
72 |
- >=x11-libs/libXcomposite-0.4 |
73 |
- x11-libs/libXcursor |
74 |
- x11-libs/libXdamage |
75 |
- x11-libs/libXext |
76 |
- >=x11-libs/libXfixes-3 |
77 |
- >=x11-libs/libXi-1.7.4 |
78 |
- x11-libs/libXtst |
79 |
- x11-libs/libxkbfile |
80 |
- x11-misc/xkeyboard-config |
81 |
- >=x11-libs/libxkbcommon-0.4.3[X] |
82 |
- x11-libs/libXrender |
83 |
- >=x11-libs/libXrandr-1.5.0 |
84 |
- x11-libs/libxcb |
85 |
- x11-libs/libXinerama |
86 |
- x11-libs/libXau |
87 |
- x11-libs/libICE |
88 |
- >=dev-libs/atk-2.5.3[introspection?] |
89 |
- >=media-libs/libcanberra-0.26 |
90 |
- sys-apps/dbus |
91 |
- media-libs/mesa[X(+),egl(+)] |
92 |
- sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) |
93 |
- systemd? ( sys-apps/systemd ) |
94 |
- wayland? ( |
95 |
- >=dev-libs/wayland-protocols-1.21 |
96 |
- >=dev-libs/wayland-1.18.0 |
97 |
- x11-libs/libdrm:= |
98 |
- >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] |
99 |
- >=dev-libs/libinput-1.18.0 |
100 |
- elogind? ( sys-auth/elogind ) |
101 |
- x11-base/xwayland |
102 |
- video_cards_nvidia? ( gui-libs/egl-wayland ) |
103 |
- ) |
104 |
- udev? ( >=dev-libs/libgudev-232:= |
105 |
- >=virtual/libudev-232-r1:= ) |
106 |
- x11-libs/libSM |
107 |
- input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) |
108 |
- >=x11-libs/startup-notification-0.7 |
109 |
- screencast? ( >=media-video/pipewire-0.3.21:= ) |
110 |
- introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
111 |
-" |
112 |
-RDEPEND="${DEPEND} |
113 |
- gnome-extra/zenity |
114 |
-" |
115 |
-DEPEND="${DEPEND} |
116 |
- x11-base/xorg-proto |
117 |
- sysprof? ( >=dev-util/sysprof-common-3.38.0 ) |
118 |
-" |
119 |
-# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary |
120 |
-BDEPEND=" |
121 |
- dev-libs/wayland |
122 |
- dev-util/gdbus-codegen |
123 |
- dev-util/glib-utils |
124 |
- >=sys-devel/gettext-0.19.8 |
125 |
- virtual/pkgconfig |
126 |
- test? ( |
127 |
- app-text/docbook-xml-dtd:4.5 |
128 |
- x11-misc/xvfb-run |
129 |
- ) |
130 |
- wayland? ( |
131 |
- >=sys-kernel/linux-headers-4.4 |
132 |
- x11-libs/libxcvt |
133 |
- ) |
134 |
-" |
135 |
- |
136 |
-PATCHES=( |
137 |
- "${FILESDIR}"/${PN}-40.0-Disable-anonymous-file-test.patch |
138 |
-) |
139 |
- |
140 |
-src_configure() { |
141 |
- # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain |
142 |
- local emesonargs=( |
143 |
- -Dopengl=true |
144 |
- #opengl_libname |
145 |
- #gles2_libname |
146 |
- $(meson_use wayland gles2) |
147 |
- -Degl=true |
148 |
- -Dglx=true |
149 |
- $(meson_use wayland) |
150 |
- $(meson_use systemd) |
151 |
- $(meson_use wayland native_backend) |
152 |
- $(meson_use screencast remote_desktop) |
153 |
- $(meson_use udev) |
154 |
- -Dudev_dir=$(get_udevdir) |
155 |
- $(meson_use input_devices_wacom libwacom) |
156 |
- -Dpango_ft2=true |
157 |
- -Dstartup_notification=true |
158 |
- -Dsm=true |
159 |
- $(meson_use introspection) |
160 |
- $(meson_use test cogl_tests) |
161 |
- $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed |
162 |
- -Dnative_tests=false |
163 |
- $(meson_use test clutter_tests) |
164 |
- $(meson_use test tests) |
165 |
- $(meson_use sysprof profiler) |
166 |
- -Dinstalled_tests=false |
167 |
- #verbose # Let upstream choose default for verbose mode |
168 |
- #xwayland_path |
169 |
- # 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) |
170 |
- #xwayland_grab_default_access_rules |
171 |
- ) |
172 |
- |
173 |
- if use wayland && use video_cards_nvidia; then |
174 |
- emesonargs+=( |
175 |
- -Degl_device=true |
176 |
- -Dwayland_eglstream=true |
177 |
- ) |
178 |
- else |
179 |
- emsonargs+=( |
180 |
- -Degl_device=false |
181 |
- -Dwayland_eglstream=false |
182 |
- ) |
183 |
- fi |
184 |
- |
185 |
- meson_src_configure |
186 |
-} |
187 |
- |
188 |
-src_test() { |
189 |
- gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed |
190 |
- glib-compile-schemas "${BUILD_DIR}"/data |
191 |
- GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI |
192 |
-} |
193 |
- |
194 |
-pkg_postinst() { |
195 |
- xdg_pkg_postinst |
196 |
- gnome2_schemas_update |
197 |
-} |
198 |
- |
199 |
-pkg_postrm() { |
200 |
- xdg_pkg_postrm |
201 |
- gnome2_schemas_update |
202 |
-} |