1 |
commit: b3d0dc9bff93b5728ab0cc7ecab98193472065c2 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 1 12:49:05 2020 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 1 16:17:38 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3d0dc9b |
7 |
|
8 |
x11-wm/mutter: bump to 3.34.4 |
9 |
|
10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
profiles/arch/amd64/package.use.mask | 4 + |
14 |
profiles/arch/base/package.use.mask | 4 + |
15 |
profiles/arch/x86/package.use.mask | 4 + |
16 |
x11-wm/mutter/Manifest | 2 + |
17 |
x11-wm/mutter/metadata.xml | 1 + |
18 |
x11-wm/mutter/mutter-3.34.4.ebuild | 149 +++++++++++++++++++++++++++++++++++ |
19 |
6 files changed, 164 insertions(+) |
20 |
|
21 |
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask |
22 |
index 9580a47ead3..df5cf9ee937 100644 |
23 |
--- a/profiles/arch/amd64/package.use.mask |
24 |
+++ b/profiles/arch/amd64/package.use.mask |
25 |
@@ -17,6 +17,10 @@ |
26 |
|
27 |
#--- END OF EXAMPLES --- |
28 |
|
29 |
+# Mart Raudsepp <leio@g.o> (2020-03-01) |
30 |
+# dev-util/sysprof-capture is keyworded on amd64 |
31 |
+x11-wm/mutter -sysprof |
32 |
+ |
33 |
# Andreas Sturmlechner <asturm@g.o> (2020-02-26) |
34 |
# Vulkan is available on amd64. |
35 |
dev-qt/qtdeclarative -vulkan |
36 |
|
37 |
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask |
38 |
index 76abd4b73d4..e10f9e3163b 100644 |
39 |
--- a/profiles/arch/base/package.use.mask |
40 |
+++ b/profiles/arch/base/package.use.mask |
41 |
@@ -1,6 +1,10 @@ |
42 |
# Copyright 1999-2020 Gentoo Authors |
43 |
# Distributed under the terms of the GNU General Public License v2 |
44 |
|
45 |
+# Mart Raudsepp <leio@g.o> (2020-03-01) |
46 |
+# dev-util/sysprof not keyworded on most arches yet |
47 |
+x11-wm/mutter sysprof |
48 |
+ |
49 |
# Andreas Sturmlechner <asturm@g.o> (2020-02-26) |
50 |
# Vulkan support is only available on few selected arches atm. |
51 |
# Mask everywhere, unmask where appropriate. |
52 |
|
53 |
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask |
54 |
index f7a4a8ce47a..95763c27f52 100644 |
55 |
--- a/profiles/arch/x86/package.use.mask |
56 |
+++ b/profiles/arch/x86/package.use.mask |
57 |
@@ -1,6 +1,10 @@ |
58 |
# Copyright 1999-2020 Gentoo Authors |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
|
61 |
+# Mart Raudsepp <leio@g.o> (2020-03-01) |
62 |
+# dev-util/sysprof-capture is keyworded on x86 |
63 |
+x11-wm/mutter -sysprof |
64 |
+ |
65 |
# Andreas Sturmlechner <asturm@g.o> (2020-02-26) |
66 |
# Vulkan is available on x86. |
67 |
dev-qt/qtdeclarative -vulkan |
68 |
|
69 |
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest |
70 |
index acdf8cbe590..7a35e41d990 100644 |
71 |
--- a/x11-wm/mutter/Manifest |
72 |
+++ b/x11-wm/mutter/Manifest |
73 |
@@ -2,3 +2,5 @@ DIST mutter-3.26.2-patchset.tar.xz 48156 BLAKE2B 7b33495a8bb7ac69f5610e1dfcb1fef |
74 |
DIST mutter-3.26.2.tar.xz 3622904 BLAKE2B b32af24c6ffcd0e6af38ab1ff7cd0ba16ea3ceb84c62ed21d9e38fff5357eda2648050beada3fc8727474407a419a2c218331c8a87f7eb68eddf824d26ca9c51 SHA512 95885b4c053d4bc467a7c11615ee3d1a3086a674ae10e7cb9bb241f692e66dd8190508db1cdf1760bc2f19100e532e68d5e147d344e94d1430d80dd26ca0156b |
75 |
DIST mutter-3.32.2-patchset.tar.xz 26872 BLAKE2B 026c87cc3859624bcfd273694a8a34661d97cc77776e3df5f6f5de16b8758fc435773b1c96172b867fe0d9bea421c56986db2e7263c6ec3482171cc2adf06295 SHA512 e318fcfa4ee7850814cdfb5fbcc118a92fa3df524a78b24a440346be6a6c7cb975f90218a2d4feeacd222f2daf56c4cff4195c83e3ed74726dc1da63d38a93c5 |
76 |
DIST mutter-3.32.2.tar.xz 2797664 BLAKE2B 8b69436778d9c3e10b0373c83e1f306cb2718e49ad1f351f2e3a1ef92caeb1eb7a391be07c60578cfb2601eea5dc3949b1d8305e9f079b2b00d43ff305409f00 SHA512 e4494d028ae71441fbdc584bd8acd9c2559d52ac72402bad9a7cb43f4f519487d11df6453172fd27a9df7f2cade020d6317931613bd0be343c66170e6cda0269 |
77 |
+DIST mutter-3.34.4-patchset.tar.xz 7216 BLAKE2B 6a9d503a8da80a9255649150c1256ea0d1459b11c0803728553f6699f0bb54b56161a411e9dec3725e5cd4230531c90b0160ef702083285443849c9ec4ca8278 SHA512 b592a6ded20c61c15fe8dc5a69fb73e81143975632237a32329bbf40239bdc2c392aef4676cd8800f7ad39eb16e8f159b0cec87c8bd035302db0a8001ddeda2e |
78 |
+DIST mutter-3.34.4.tar.xz 2791624 BLAKE2B cd7ea49333dc50574f993f15638504eac0d0a6f1e85f34a617accbabcec71f02244ce6cd292c968def302652707e21692d94dcccb01d59b3661220c90cefd802 SHA512 6cae8473071d9ab105a3635cee314157a268894fc3b18e53857e097223a9c2677e1cd51b10b501a3b85f74c83470c2ce87986972218f9833c9f6ad31b1910f6a |
79 |
|
80 |
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml |
81 |
index 4da93b48e48..9bd58e53b93 100644 |
82 |
--- a/x11-wm/mutter/metadata.xml |
83 |
+++ b/x11-wm/mutter/metadata.xml |
84 |
@@ -9,5 +9,6 @@ |
85 |
<flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as logind provider for Wayland sessions</flag> |
86 |
<flag name="gles2">Enable OpenGL ES 2.0 support</flag> |
87 |
<flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag> |
88 |
+ <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag> |
89 |
</use> |
90 |
</pkgmetadata> |
91 |
|
92 |
diff --git a/x11-wm/mutter/mutter-3.34.4.ebuild b/x11-wm/mutter/mutter-3.34.4.ebuild |
93 |
new file mode 100644 |
94 |
index 00000000000..b7a1e3cfc33 |
95 |
--- /dev/null |
96 |
+++ b/x11-wm/mutter/mutter-3.34.4.ebuild |
97 |
@@ -0,0 +1,149 @@ |
98 |
+# Copyright 1999-2020 Gentoo Authors |
99 |
+# Distributed under the terms of the GNU General Public License v2 |
100 |
+ |
101 |
+EAPI=7 |
102 |
+inherit gnome.org gnome2-utils meson virtualx xdg |
103 |
+ |
104 |
+DESCRIPTION="GNOME 3 compositing window manager based on Clutter" |
105 |
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" |
106 |
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz" |
107 |
+ |
108 |
+LICENSE="GPL-2+" |
109 |
+SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot |
110 |
+ |
111 |
+IUSE="elogind input_devices_wacom +introspection screencast +sysprof systemd test udev wayland" |
112 |
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider |
113 |
+REQUIRED_USE=" |
114 |
+ wayland? ( ^^ ( elogind systemd ) udev ) |
115 |
+ test? ( wayland )" |
116 |
+RESTRICT="!test? ( test )" |
117 |
+ |
118 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
119 |
+ |
120 |
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema |
121 |
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland |
122 |
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order |
123 |
+DEPEND=" |
124 |
+ x11-libs/libX11 |
125 |
+ >=x11-libs/gtk+-3.19.8:3[X,introspection?] |
126 |
+ x11-libs/gdk-pixbuf:2 |
127 |
+ >=x11-libs/pango-1.30[introspection?] |
128 |
+ >=dev-libs/fribidi-1.0.0 |
129 |
+ >=x11-libs/cairo-1.14[X] |
130 |
+ >=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?] |
131 |
+ >=dev-libs/glib-2.61.1:2 |
132 |
+ gnome-base/gnome-settings-daemon |
133 |
+ >=dev-libs/json-glib-0.12.0[introspection?] |
134 |
+ gnome-base/gnome-desktop:3= |
135 |
+ >=x11-libs/libXcomposite-0.4 |
136 |
+ x11-libs/libXcursor |
137 |
+ x11-libs/libXdamage |
138 |
+ x11-libs/libXext |
139 |
+ >=x11-libs/libXfixes-3 |
140 |
+ >=x11-libs/libXi-1.7.4 |
141 |
+ x11-libs/libXtst |
142 |
+ x11-libs/libxkbfile |
143 |
+ x11-misc/xkeyboard-config |
144 |
+ >=x11-libs/libxkbcommon-0.4.3[X] |
145 |
+ x11-libs/libXrender |
146 |
+ >=x11-libs/libXrandr-1.5.0 |
147 |
+ x11-libs/libxcb |
148 |
+ x11-libs/libXinerama |
149 |
+ x11-libs/libXau |
150 |
+ x11-libs/libICE |
151 |
+ >=dev-libs/atk-2.5.3[introspection?] |
152 |
+ >=media-libs/libcanberra-0.26 |
153 |
+ media-libs/mesa[X(+),egl] |
154 |
+ wayland? ( |
155 |
+ >=dev-libs/wayland-protocols-1.18 |
156 |
+ >=dev-libs/wayland-1.13.0 |
157 |
+ x11-libs/libdrm:= |
158 |
+ >=media-libs/mesa-10.3[egl,gbm,wayland,gles2] |
159 |
+ >=dev-libs/libinput-1.4 |
160 |
+ systemd? ( sys-apps/systemd ) |
161 |
+ elogind? ( sys-auth/elogind ) |
162 |
+ x11-base/xorg-server[wayland] |
163 |
+ ) |
164 |
+ udev? ( >=dev-libs/libgudev-232:= |
165 |
+ >=virtual/libudev-232-r1:= ) |
166 |
+ x11-libs/libSM |
167 |
+ input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) |
168 |
+ >=x11-libs/startup-notification-0.7 |
169 |
+ screencast? ( >=media-video/pipewire-0.2.2:0/0.2 ) |
170 |
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
171 |
+" |
172 |
+RDEPEND="${DEPEND} |
173 |
+ gnome-extra/zenity |
174 |
+" |
175 |
+DEPEND="${DEPEND} |
176 |
+ x11-base/xorg-proto |
177 |
+ sysprof? ( dev-util/sysprof-capture:3 ) |
178 |
+" |
179 |
+# wayland bdepend for wayland-scanner, xorg-server for cvt utility |
180 |
+BDEPEND=" |
181 |
+ dev-libs/wayland |
182 |
+ >=dev-util/meson-0.50.0 |
183 |
+ dev-util/gdbus-codegen |
184 |
+ dev-util/glib-utils |
185 |
+ >=sys-devel/gettext-0.19.8 |
186 |
+ virtual/pkgconfig |
187 |
+ test? ( app-text/docbook-xml-dtd:4.5 ) |
188 |
+ wayland? ( >=sys-kernel/linux-headers-4.4 |
189 |
+ x11-base/xorg-server ) |
190 |
+" |
191 |
+ |
192 |
+PATCHES=( |
193 |
+ # Some patches from gnome-3-34 branch on top of 3.34.4 |
194 |
+ "${WORKDIR}"/patches/ |
195 |
+ |
196 |
+ "${FILESDIR}"/3.32-eglmesaext-include.patch |
197 |
+) |
198 |
+ |
199 |
+src_configure() { |
200 |
+ # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain |
201 |
+ local emesonargs=( |
202 |
+ -Dopengl=true |
203 |
+ #opengl_libname |
204 |
+ #gles2_libname |
205 |
+ $(meson_use wayland gles2) |
206 |
+ -Degl=true |
207 |
+ -Dglx=true |
208 |
+ $(meson_use wayland) |
209 |
+ $(meson_use wayland native_backend) |
210 |
+ $(meson_use screencast remote_desktop) |
211 |
+ -Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there |
212 |
+ -Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc |
213 |
+ $(meson_use udev) |
214 |
+ $(meson_use input_devices_wacom libwacom) |
215 |
+ -Dpango_ft2=true |
216 |
+ -Dstartup_notification=true |
217 |
+ -Dsm=true |
218 |
+ $(meson_use introspection) |
219 |
+ $(meson_use test cogl_tests) |
220 |
+ $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed |
221 |
+ $(meson_use test clutter_tests) |
222 |
+ $(meson_use test tests) |
223 |
+ $(meson_use sysprof profiler) |
224 |
+ -Dinstalled_tests=false |
225 |
+ #verbose # Let upstream choose default for verbose mode |
226 |
+ #xwayland_path |
227 |
+ # 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) |
228 |
+ #xwayland_grab_default_access_rules |
229 |
+ ) |
230 |
+ meson_src_configure |
231 |
+} |
232 |
+ |
233 |
+src_test() { |
234 |
+ glib-compile-schemas "${BUILD_DIR}"/data |
235 |
+ GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test |
236 |
+} |
237 |
+ |
238 |
+pkg_postinst() { |
239 |
+ xdg_pkg_postinst |
240 |
+ gnome2_schemas_update |
241 |
+} |
242 |
+ |
243 |
+pkg_postrm() { |
244 |
+ xdg_pkg_postrm |
245 |
+ gnome2_schemas_update |
246 |
+} |