Source: muffin
Version: 1.7.3-1
Severity: serious
Tags: patch
Hi,
muffin FTBFS with the new cogl. The attached debdiff fixes this issue.
I plan to NMU this RSN if no action is taken, as this is going to block
the cogl transition soon.
Regards,
Emilio
diff -Nru muffin-1.7.3/debian/changelog muffin-1.7.3/debian/changelog
--- muffin-1.7.3/debian/changelog 2013-04-21 13:02:14.000000000 +0200
+++ muffin-1.7.3/debian/changelog 2014-03-27 15:12:13.000000000 +0100
@@ -1,3 +1,13 @@
+muffin (1.7.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/0001-Update-for-Cogl-API-breaks.patch:
+ + Fix build with new cogl.
+ * debian/control:
+ + Build depend on libcogl-dev >= 1.18, needed for the above change.
+
+ -- Emilio Pozuelo Monfort <po...@debian.org> Thu, 27 Mar 2014 15:11:52 +0100
+
muffin (1.7.3-1) unstable; urgency=low
* New upstream: muffin_1.7.3
diff -Nru muffin-1.7.3/debian/control muffin-1.7.3/debian/control
--- muffin-1.7.3/debian/control 2013-04-20 17:35:01.000000000 +0200
+++ muffin-1.7.3/debian/control 2014-03-27 15:11:45.000000000 +0100
@@ -11,6 +11,7 @@
gobject-introspection (>= 0.9.12-5~),
libgirepository1.0-dev (>= 0.9.12),
libjson-glib-dev (>= 0.13.2-1~),
+ libcogl-dev (>= 1.18),
libclutter-1.0-dev (>= 1.7.5),
libpango1.0-dev (>= 1.2.0),
libgconf2-dev (>= 2.6.1-2),
diff -Nru muffin-1.7.3/debian/patches/0001-Update-for-Cogl-API-breaks.patch muffin-1.7.3/debian/patches/0001-Update-for-Cogl-API-breaks.patch
--- muffin-1.7.3/debian/patches/0001-Update-for-Cogl-API-breaks.patch 1970-01-01 01:00:00.000000000 +0100
+++ muffin-1.7.3/debian/patches/0001-Update-for-Cogl-API-breaks.patch 2014-03-08 19:20:44.000000000 +0100
@@ -0,0 +1,84 @@
+From d2a1db8834bf0a9007bf6924b006a6f2c94ce88d Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpie...@mecheye.net>
+Date: Mon, 13 Jan 2014 13:03:19 -0500
+Subject: [PATCH] Update for Cogl API breaks
+
+---
+ configure.ac | 2 +-
+ src/compositor/meta-texture-rectangle.c | 9 ++-------
+ src/compositor/meta-texture-rectangle.h | 4 +---
+ src/compositor/meta-texture-tower.c | 4 ----
+ src/compositor/meta-window-actor.c | 5 +----
+ src/core/meta-cursor-tracker.c | 1 -
+ 6 files changed, 5 insertions(+), 20 deletions(-)
+
+--- a/src/compositor/meta-texture-rectangle.c
++++ b/src/compositor/meta-texture-rectangle.c
+@@ -35,10 +35,8 @@
+ meta_texture_rectangle_new (unsigned int width,
+ unsigned int height,
+ CoglPixelFormat format,
+- CoglPixelFormat internal_format,
+ unsigned int rowstride,
+- const guint8 *data,
+- GError **error)
++ const guint8 *data)
+ {
+ ClutterBackend *backend =
+ clutter_get_default_backend ();
+@@ -46,10 +44,7 @@
+ clutter_backend_get_cogl_context (backend);
+ CoglTextureRectangle *tex_rect;
+
+- tex_rect = cogl_texture_rectangle_new_with_size (context,
+- width, height,
+- internal_format,
+- error);
++ tex_rect = cogl_texture_rectangle_new_with_size (context, width, height);
+ if (tex_rect == NULL)
+ return NULL;
+
+--- a/src/compositor/meta-texture-rectangle.h
++++ b/src/compositor/meta-texture-rectangle.h
+@@ -34,10 +34,8 @@
+ meta_texture_rectangle_new (unsigned int width,
+ unsigned int height,
+ CoglPixelFormat format,
+- CoglPixelFormat internal_format,
+ unsigned int rowstride,
+- const guint8 *data,
+- GError **error);
++ const guint8 *data);
+
+ gboolean
+ meta_texture_rectangle_check (CoglTexture *texture);
+--- a/src/compositor/meta-texture-tower.c
++++ b/src/compositor/meta-texture-tower.c
+@@ -365,13 +365,9 @@
+ meta_texture_rectangle_new (width, height,
+ /* data format */
+ TEXTURE_FORMAT,
+- /* internal cogl format */
+- TEXTURE_FORMAT,
+ /* rowstride */
+ width * 4,
+ /* data */
+- NULL,
+- /* error */
+ NULL);
+ }
+ else
+--- a/src/compositor/meta-shaped-texture.c
++++ b/src/compositor/meta-shaped-texture.c
+@@ -295,10 +295,8 @@
+ if (meta_texture_rectangle_check (paint_tex))
+ priv->mask_texture = meta_texture_rectangle_new (tex_width, tex_height,
+ COGL_PIXEL_FORMAT_A_8,
+- COGL_PIXEL_FORMAT_A_8,
+ stride,
+- mask_data,
+- NULL /* error */);
++ mask_data);
+ else
+ priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
+ COGL_TEXTURE_NONE,
diff -Nru muffin-1.7.3/debian/patches/series muffin-1.7.3/debian/patches/series
--- muffin-1.7.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ muffin-1.7.3/debian/patches/series 2014-03-08 19:17:46.000000000 +0100
@@ -0,0 +1 @@
+0001-Update-for-Cogl-API-breaks.patch
