Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/, x11-wm/mutter/files/
Date: Sat, 03 Oct 2015 09:05:36
Message-Id: 1443863123.da3aadab245927722168f6d9adaa0513d39c1afb.pacho@gentoo
1 commit: da3aadab245927722168f6d9adaa0513d39c1afb
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 3 09:05:23 2015 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 3 09:05:23 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da3aadab
7
8 x11-wm/mutter: Drop old
9
10 Package-Manager: portage-2.2.22
11
12 x11-wm/mutter/Manifest | 1 -
13 .../files/mutter-3.16.2-size-unredirected.patch | 151 ---------------------
14 x11-wm/mutter/mutter-3.16.2-r1.ebuild | 97 -------------
15 x11-wm/mutter/mutter-3.16.2.ebuild | 91 -------------
16 x11-wm/mutter/mutter-3.16.3-r1.ebuild | 10 +-
17 5 files changed, 5 insertions(+), 345 deletions(-)
18
19 diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
20 index 3633659..43311d2 100644
21 --- a/x11-wm/mutter/Manifest
22 +++ b/x11-wm/mutter/Manifest
23 @@ -1,3 +1,2 @@
24 DIST mutter-3.14.4.tar.xz 1608836 SHA256 b4fbcc0664484d6215fc1f2101e9b636303de63544b786f2f87ebf2f6a616a8b SHA512 5b6e2d969e9a328e23bedb9fd0409da1af0d2ae8ded6a940992d4cff18a8cbfe2aa6582a56a2c8bd549a560a84d8cbffe953f151bcadf235315b8ec8bc7d1267 WHIRLPOOL 45c0329832999f14a5eaa77df3a6c7bbc72556b779fc55b3db9505594efec40252996bf8d96083da47fdb67b6bf5a9402f526d8bbb1e5436e5de16a8520e4acf
25 -DIST mutter-3.16.2.tar.xz 1549760 SHA256 4a2b752f0b3aa59f50563190222623324f5154acbb6bf174213f5849e77d0763 SHA512 f2cd350f8dbd03bc8e58f6c3f1b48cd51b38ae56e020d4e02100ef02f003d797a20095acf6a8874563fde42cfde49c4a28c418af151ee49f24ed391d5ae3caba WHIRLPOOL a88badf1f59c8c6ba8dcde4af207a2e66e66abbd6fd6c436289591bbb6eb3b017f50a7122282b69fd7d55127029e7623b7cbca3467d2d25d95c8ff6077dc371b
26 DIST mutter-3.16.3.tar.xz 1550004 SHA256 ee0098487d1bfb8f28e3927fbb9df227d846555142d352f8693f56a08441c755 SHA512 31b6319c605d2576bf179e01534fe886a997677c63f19fa5d4a2d71e616a02de89d3edb069a444fb84c6fdf5a471afa2bda1d835c07e5d6dce712b2485e5937d WHIRLPOOL 23cc5161edb108137c9c983551b57659fc02c179bc7e08abebd5b26b98dcc1a17e00579a6b1e9f6fc544a92a877282fa1202a6390a14ef92ca6374dae1750112
27
28 diff --git a/x11-wm/mutter/files/mutter-3.16.2-size-unredirected.patch b/x11-wm/mutter/files/mutter-3.16.2-size-unredirected.patch
29 deleted file mode 100644
30 index 0999ebd..0000000
31 --- a/x11-wm/mutter/files/mutter-3.16.2-size-unredirected.patch
32 +++ /dev/null
33 @@ -1,151 +0,0 @@
34 -From 351f444f9d16a90636feb217b15f0f376bf96d85 Mon Sep 17 00:00:00 2001
35 -From: "Jasper St. Pierre" <jstpierre@×××××××.net>
36 -Date: Tue, 23 Jun 2015 16:23:45 -0700
37 -Subject: surface-actor-x11: Make sure to set a size when unredirected
38 -
39 -When we're unredirected, we don't have a pixmap, and thus our allocation
40 -becomes 0x0. So when events come in, they pass right through our actor,
41 -going to the one underneath in the stack.
42 -
43 -Fix this by having a fallback size on the shaped texture actor when
44 -we're unredirected, causing it to always have a valid allocation.
45 -
46 -This fixes clicking on stuff in sloppy / mouse mode focus.
47 -
48 -diff --git a/src/compositor/meta-shaped-texture-private.h b/src/compositor/meta-shaped-texture-private.h
49 -index 4ee8027..21c6335 100644
50 ---- a/src/compositor/meta-shaped-texture-private.h
51 -+++ b/src/compositor/meta-shaped-texture-private.h
52 -@@ -32,6 +32,9 @@
53 - ClutterActor *meta_shaped_texture_new (void);
54 - void meta_shaped_texture_set_texture (MetaShapedTexture *stex,
55 - CoglTexture *texture);
56 -+void meta_shaped_texture_set_fallback_size (MetaShapedTexture *stex,
57 -+ guint fallback_width,
58 -+ guint fallback_height);
59 - gboolean meta_shaped_texture_is_obscured (MetaShapedTexture *self);
60 -
61 - #endif
62 -diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
63 -index 163c5e6..8701d1b 100644
64 ---- a/src/compositor/meta-shaped-texture.c
65 -+++ b/src/compositor/meta-shaped-texture.c
66 -@@ -86,6 +86,7 @@ struct _MetaShapedTexturePrivate
67 - cairo_region_t *unobscured_region;
68 -
69 - guint tex_width, tex_height;
70 -+ guint fallback_width, fallback_height;
71 -
72 - guint create_mipmaps : 1;
73 - };
74 -@@ -136,7 +137,20 @@ set_unobscured_region (MetaShapedTexture *self,
75 - g_clear_pointer (&priv->unobscured_region, (GDestroyNotify) cairo_region_destroy);
76 - if (unobscured_region)
77 - {
78 -- cairo_rectangle_int_t bounds = { 0, 0, priv->tex_width, priv->tex_height };
79 -+ guint width, height;
80 -+
81 -+ if (priv->texture)
82 -+ {
83 -+ width = priv->tex_width;
84 -+ height = priv->tex_height;
85 -+ }
86 -+ else
87 -+ {
88 -+ width = priv->fallback_width;
89 -+ height = priv->fallback_height;
90 -+ }
91 -+
92 -+ cairo_rectangle_int_t bounds = { 0, 0, width, height };
93 - priv->unobscured_region = cairo_region_copy (unobscured_region);
94 - cairo_region_intersect_rectangle (priv->unobscured_region, &bounds);
95 - }
96 -@@ -499,16 +513,21 @@ meta_shaped_texture_get_preferred_width (ClutterActor *self,
97 - gfloat *natural_width_p)
98 - {
99 - MetaShapedTexturePrivate *priv;
100 -+ guint width;
101 -
102 - g_return_if_fail (META_IS_SHAPED_TEXTURE (self));
103 -
104 - priv = META_SHAPED_TEXTURE (self)->priv;
105 -
106 -- if (min_width_p)
107 -- *min_width_p = priv->tex_width;
108 -+ if (priv->texture)
109 -+ width = priv->tex_width;
110 -+ else
111 -+ width = priv->fallback_width;
112 -
113 -+ if (min_width_p)
114 -+ *min_width_p = width;
115 - if (natural_width_p)
116 -- *natural_width_p = priv->tex_width;
117 -+ *natural_width_p = width;
118 - }
119 -
120 - static void
121 -@@ -518,16 +537,21 @@ meta_shaped_texture_get_preferred_height (ClutterActor *self,
122 - gfloat *natural_height_p)
123 - {
124 - MetaShapedTexturePrivate *priv;
125 -+ guint height;
126 -
127 - g_return_if_fail (META_IS_SHAPED_TEXTURE (self));
128 -
129 - priv = META_SHAPED_TEXTURE (self)->priv;
130 -
131 -- if (min_height_p)
132 -- *min_height_p = priv->tex_height;
133 -+ if (priv->texture)
134 -+ height = priv->tex_height;
135 -+ else
136 -+ height = priv->fallback_height;
137 -
138 -+ if (min_height_p)
139 -+ *min_height_p = height;
140 - if (natural_height_p)
141 -- *natural_height_p = priv->tex_height;
142 -+ *natural_height_p = height;
143 - }
144 -
145 - static cairo_region_t *
146 -@@ -860,6 +884,17 @@ meta_shaped_texture_get_image (MetaShapedTexture *stex,
147 - return surface;
148 - }
149 -
150 -+void
151 -+meta_shaped_texture_set_fallback_size (MetaShapedTexture *self,
152 -+ guint fallback_width,
153 -+ guint fallback_height)
154 -+{
155 -+ MetaShapedTexturePrivate *priv = self->priv;
156 -+
157 -+ priv->fallback_width = fallback_width;
158 -+ priv->fallback_height = fallback_height;
159 -+}
160 -+
161 - static void
162 - meta_shaped_texture_cull_out (MetaCullable *cullable,
163 - cairo_region_t *unobscured_region,
164 -diff --git a/src/compositor/meta-surface-actor-x11.c b/src/compositor/meta-surface-actor-x11.c
165 -index 4aa7ecd..b50b8f2 100644
166 ---- a/src/compositor/meta-surface-actor-x11.c
167 -+++ b/src/compositor/meta-surface-actor-x11.c
168 -@@ -416,6 +416,7 @@ meta_surface_actor_x11_set_size (MetaSurfaceActorX11 *self,
169 - int width, int height)
170 - {
171 - MetaSurfaceActorX11Private *priv = meta_surface_actor_x11_get_instance_private (self);
172 -+ MetaShapedTexture *stex = meta_surface_actor_get_texture (META_SURFACE_ACTOR (self));
173 -
174 - if (priv->last_width == width &&
175 - priv->last_height == height)
176 -@@ -424,4 +425,5 @@ meta_surface_actor_x11_set_size (MetaSurfaceActorX11 *self,
177 - priv->size_changed = TRUE;
178 - priv->last_width = width;
179 - priv->last_height = height;
180 -+ meta_shaped_texture_set_fallback_size (stex, width, height);
181 - }
182 ---
183 -cgit v0.10.2
184 -
185
186 diff --git a/x11-wm/mutter/mutter-3.16.2-r1.ebuild b/x11-wm/mutter/mutter-3.16.2-r1.ebuild
187 deleted file mode 100644
188 index 19d40dc..0000000
189 --- a/x11-wm/mutter/mutter-3.16.2-r1.ebuild
190 +++ /dev/null
191 @@ -1,97 +0,0 @@
192 -# Copyright 1999-2015 Gentoo Foundation
193 -# Distributed under the terms of the GNU General Public License v2
194 -# $Id$
195 -
196 -EAPI="5"
197 -GCONF_DEBUG="yes"
198 -
199 -inherit eutils gnome2
200 -
201 -DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
202 -HOMEPAGE="https://git.gnome.org/browse/mutter/"
203 -
204 -LICENSE="GPL-2+"
205 -SLOT="0"
206 -IUSE="+introspection +kms test wayland"
207 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
208 -
209 -# libXi-1.7.4 or newer needed per:
210 -# https://bugzilla.gnome.org/show_bug.cgi?id=738944
211 -COMMON_DEPEND="
212 - >=x11-libs/pango-1.2[X,introspection?]
213 - >=x11-libs/cairo-1.10[X]
214 - >=x11-libs/gtk+-3.9.11:3[X,introspection?]
215 - >=dev-libs/glib-2.36.0:2[dbus]
216 - >=media-libs/clutter-1.21.3:1.0[introspection?]
217 - >=media-libs/cogl-1.17.1:1.0=[introspection?]
218 - >=media-libs/libcanberra-0.26[gtk3]
219 - >=x11-libs/startup-notification-0.7
220 - >=x11-libs/libXcomposite-0.2
221 - >=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?]
222 - gnome-base/gnome-desktop:3=
223 - >sys-power/upower-0.99:=
224 -
225 - x11-libs/libICE
226 - x11-libs/libSM
227 - x11-libs/libX11
228 - >=x11-libs/libXcomposite-0.2
229 - x11-libs/libXcursor
230 - x11-libs/libXdamage
231 - x11-libs/libXext
232 - x11-libs/libXfixes
233 - >=x11-libs/libXi-1.7.4
234 - x11-libs/libXinerama
235 - x11-libs/libXrandr
236 - x11-libs/libXrender
237 - x11-libs/libxcb
238 - x11-libs/libxkbfile
239 - >=x11-libs/libxkbcommon-0.4.3[X]
240 - x11-misc/xkeyboard-config
241 -
242 - gnome-extra/zenity
243 -
244 - introspection? ( >=dev-libs/gobject-introspection-1.42:= )
245 - kms? (
246 - dev-libs/libinput
247 - >=media-libs/clutter-1.20[egl]
248 - media-libs/cogl:1.0=[kms]
249 - >=media-libs/mesa-10.3[gbm]
250 - sys-apps/systemd
251 - virtual/libgudev
252 - x11-libs/libdrm:= )
253 - wayland? (
254 - >=dev-libs/wayland-1.6.90
255 - >=media-libs/clutter-1.20[wayland]
256 - x11-base/xorg-server[wayland] )
257 -"
258 -DEPEND="${COMMON_DEPEND}
259 - >=dev-util/gtk-doc-am-1.15
260 - >=dev-util/intltool-0.41
261 - sys-devel/gettext
262 - virtual/pkgconfig
263 - x11-proto/xextproto
264 - x11-proto/xineramaproto
265 - x11-proto/xproto
266 - test? ( app-text/docbook-xml-dtd:4.5 )
267 -"
268 -RDEPEND="${COMMON_DEPEND}
269 - !x11-misc/expocity
270 -"
271 -
272 -src_prepare() {
273 - # surface-actor-x11: Make sure to set a size when unredirected (from 3.16 branch)
274 - epatch "${FILESDIR}"/${P}-size-unredirected.patch
275 - gnome2_src_prepare
276 -}
277 -
278 -src_configure() {
279 - gnome2_src_configure \
280 - --disable-static \
281 - --enable-sm \
282 - --enable-startup-notification \
283 - --enable-verbose-mode \
284 - --with-libcanberra \
285 - $(use_enable introspection) \
286 - $(use_enable kms native-backend) \
287 - $(use_enable wayland)
288 -}
289
290 diff --git a/x11-wm/mutter/mutter-3.16.2.ebuild b/x11-wm/mutter/mutter-3.16.2.ebuild
291 deleted file mode 100644
292 index c464ffd..0000000
293 --- a/x11-wm/mutter/mutter-3.16.2.ebuild
294 +++ /dev/null
295 @@ -1,91 +0,0 @@
296 -# Copyright 1999-2015 Gentoo Foundation
297 -# Distributed under the terms of the GNU General Public License v2
298 -# $Id$
299 -
300 -EAPI="5"
301 -GCONF_DEBUG="yes"
302 -
303 -inherit eutils gnome2
304 -
305 -DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
306 -HOMEPAGE="https://git.gnome.org/browse/mutter/"
307 -
308 -LICENSE="GPL-2+"
309 -SLOT="0"
310 -IUSE="+introspection +kms test wayland"
311 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
312 -
313 -# libXi-1.7.4 or newer needed per:
314 -# https://bugzilla.gnome.org/show_bug.cgi?id=738944
315 -COMMON_DEPEND="
316 - >=x11-libs/pango-1.2[X,introspection?]
317 - >=x11-libs/cairo-1.10[X]
318 - >=x11-libs/gtk+-3.9.11:3[X,introspection?]
319 - >=dev-libs/glib-2.36.0:2[dbus]
320 - >=media-libs/clutter-1.21.3:1.0[introspection?]
321 - >=media-libs/cogl-1.17.1:1.0=[introspection?]
322 - >=media-libs/libcanberra-0.26[gtk3]
323 - >=x11-libs/startup-notification-0.7
324 - >=x11-libs/libXcomposite-0.2
325 - >=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?]
326 - gnome-base/gnome-desktop:3=
327 - >sys-power/upower-0.99:=
328 -
329 - x11-libs/libICE
330 - x11-libs/libSM
331 - x11-libs/libX11
332 - >=x11-libs/libXcomposite-0.2
333 - x11-libs/libXcursor
334 - x11-libs/libXdamage
335 - x11-libs/libXext
336 - x11-libs/libXfixes
337 - >=x11-libs/libXi-1.7.4
338 - x11-libs/libXinerama
339 - x11-libs/libXrandr
340 - x11-libs/libXrender
341 - x11-libs/libxcb
342 - x11-libs/libxkbfile
343 - >=x11-libs/libxkbcommon-0.4.3[X]
344 - x11-misc/xkeyboard-config
345 -
346 - gnome-extra/zenity
347 -
348 - introspection? ( >=dev-libs/gobject-introspection-1.42:= )
349 - kms? (
350 - dev-libs/libinput
351 - >=media-libs/clutter-1.20[egl]
352 - media-libs/cogl:1.0=[kms]
353 - >=media-libs/mesa-10.3[gbm]
354 - sys-apps/systemd
355 - virtual/libgudev
356 - x11-libs/libdrm:= )
357 - wayland? (
358 - >=dev-libs/wayland-1.6.90
359 - >=media-libs/clutter-1.20[wayland]
360 - x11-base/xorg-server[wayland] )
361 -"
362 -DEPEND="${COMMON_DEPEND}
363 - >=dev-util/gtk-doc-am-1.15
364 - >=dev-util/intltool-0.41
365 - sys-devel/gettext
366 - virtual/pkgconfig
367 - x11-proto/xextproto
368 - x11-proto/xineramaproto
369 - x11-proto/xproto
370 - test? ( app-text/docbook-xml-dtd:4.5 )
371 -"
372 -RDEPEND="${COMMON_DEPEND}
373 - !x11-misc/expocity
374 -"
375 -
376 -src_configure() {
377 - gnome2_src_configure \
378 - --disable-static \
379 - --enable-sm \
380 - --enable-startup-notification \
381 - --enable-verbose-mode \
382 - --with-libcanberra \
383 - $(use_enable introspection) \
384 - $(use_enable kms native-backend) \
385 - $(use_enable wayland)
386 -}
387
388 diff --git a/x11-wm/mutter/mutter-3.16.3-r1.ebuild b/x11-wm/mutter/mutter-3.16.3-r1.ebuild
389 index 98cc39c..76f8ab6 100644
390 --- a/x11-wm/mutter/mutter-3.16.3-r1.ebuild
391 +++ b/x11-wm/mutter/mutter-3.16.3-r1.ebuild
392 @@ -81,19 +81,19 @@ RDEPEND="${COMMON_DEPEND}
393 src_prepare() {
394 # Fallback to a default keymap if getting it from X fails (from 'master')
395 epatch "${FILESDIR}"/${PN}-3.16.3-fallback-keymap.patch
396 -
397 +
398 # frames: handle META_FRAME_CONTROL_NONE on left click (from '3.16')
399 epatch "${FILESDIR}"/${P}-crash-border.patch
400 -
401 +
402 # compositor: Add support for GL_EXT_x11_sync_object (from '3.16')
403 epatch "${FILESDIR}"/${P}-GL_EXT_x11_sync_object.patch
404 -
405 +
406 # compositor: Fix GL_EXT_x11_sync_object race condition (from '3.16')
407 epatch "${FILESDIR}"/${P}-fix-race.patch
408 -
409 +
410 # build: Fix return value in meta-sync-ring.c (from '3.16')
411 epatch "${FILESDIR}"/${P}-fix-return.patch
412 -
413 +
414 # compositor: Handle fences in the frontend X connection (from '3.16')
415 epatch "${FILESDIR}"/${P}-flickering.patch
Report Message
Find on MARC Find on Google Groups