Codebase list muffin / d79024a
Refresh patches. Maximiliano Curia 10 years ago
4 changed file(s) with 4 addition(s) and 90 deletion(s). Raw diff Collapse all Expand all
+1
-0
debian/changelog less more
11
22 * Update VCS fields.
33 * New upstream release.
4 * Remove patch: update-cogl-support adapted upstream.
45
56 -- Maximiliano Curia <maxy@debian.org> Fri, 16 May 2014 20:17:36 +0200
67
+3
-3
debian/patches/gtk-state-flags less more
00 Index: muffin/src/ui/theme.c
11 ===================================================================
2 --- muffin.orig/src/ui/theme.c 2014-04-26 18:28:24.827858616 +0200
3 +++ muffin/src/ui/theme.c 2014-04-26 18:29:06.381342080 +0200
4 @@ -6441,6 +6441,10 @@
2 --- muffin.orig/src/ui/theme.c 2014-05-17 12:16:45.734160322 +0200
3 +++ muffin/src/ui/theme.c 2014-05-17 12:16:45.730160482 +0200
4 @@ -6453,6 +6453,10 @@
55 return "FOCUSED";
66 case GTK_STATE_FLAG_BACKDROP:
77 return "BACKDROP";
+0
-1
debian/patches/series less more
00 support-muffin-typelib
1 update-cogl-support
21 gtk-state-flags
+0
-86
debian/patches/update-cogl-support less more
0 From d2a1db8834bf0a9007bf6924b006a6f2c94ce88d Mon Sep 17 00:00:00 2001
1 From: Jasper St. Pierre <jstpierre@mecheye.net>
2 Date: Mon, 13 Jan 2014 18:03:19 +0000
3 Subject: Update for Cogl API breaks
4
5 ---
6 (limited to 'src/compositor')
7
8 diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c
9 index 3fc9430..450155d 100644
10 --- a/src/compositor/meta-texture-rectangle.c
11 +++ b/src/compositor/meta-texture-rectangle.c
12 @@ -35,10 +35,8 @@ CoglTexture *
13 meta_texture_rectangle_new (unsigned int width,
14 unsigned int height,
15 CoglPixelFormat format,
16 - CoglPixelFormat internal_format,
17 unsigned int rowstride,
18 - const guint8 *data,
19 - GError **error)
20 + const guint8 *data)
21 {
22 ClutterBackend *backend =
23 clutter_get_default_backend ();
24 @@ -46,10 +44,7 @@ meta_texture_rectangle_new (unsigned int width,
25 clutter_backend_get_cogl_context (backend);
26 CoglTextureRectangle *tex_rect;
27
28 - tex_rect = cogl_texture_rectangle_new_with_size (context,
29 - width, height,
30 - internal_format,
31 - error);
32 + tex_rect = cogl_texture_rectangle_new_with_size (context, width, height);
33 if (tex_rect == NULL)
34 return NULL;
35
36 diff --git a/src/compositor/meta-texture-rectangle.h b/src/compositor/meta-texture-rectangle.h
37 index 30f60d3..7b84229 100644
38 --- a/src/compositor/meta-texture-rectangle.h
39 +++ b/src/compositor/meta-texture-rectangle.h
40 @@ -34,10 +34,8 @@ CoglTexture *
41 meta_texture_rectangle_new (unsigned int width,
42 unsigned int height,
43 CoglPixelFormat format,
44 - CoglPixelFormat internal_format,
45 unsigned int rowstride,
46 - const guint8 *data,
47 - GError **error);
48 + const guint8 *data);
49
50 gboolean
51 meta_texture_rectangle_check (CoglTexture *texture);
52 diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c
53 index 9a30de0..019aaf4 100644
54 --- a/src/compositor/meta-texture-tower.c
55 +++ b/src/compositor/meta-texture-tower.c
56 @@ -365,13 +365,9 @@ texture_tower_create_texture (MetaTextureTower *tower,
57 meta_texture_rectangle_new (width, height,
58 /* data format */
59 TEXTURE_FORMAT,
60 - /* internal cogl format */
61 - TEXTURE_FORMAT,
62 /* rowstride */
63 width * 4,
64 /* data */
65 - NULL,
66 - /* error */
67 NULL);
68 }
69 else
70 --- a/src/compositor/meta-shaped-texture.c
71 +++ b/src/compositor/meta-shaped-texture.c
72 @@ -295,10 +295,7 @@ meta_shaped_texture_ensure_mask (MetaSha
73 if (meta_texture_rectangle_check (paint_tex))
74 priv->mask_texture = meta_texture_rectangle_new (tex_width, tex_height,
75 COGL_PIXEL_FORMAT_A_8,
76 - COGL_PIXEL_FORMAT_A_8,
77 - stride,
78 - mask_data,
79 - NULL /* error */);
80 + stride, mask_data);
81 else
82 priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
83 COGL_TEXTURE_NONE,
84 --
85 cgit v0.9.2