Source: mx
Version: 1.4.6-1
Severity: important
mx will FTBFS when we upload cogl 1.14 to unstable, as that version doesn't
expose GL headers anymore. In order to make the transition as smooth as
possible, it'll be great if you can upload the attached debdiff to unstable
*now*. The patch makes mx build with both old and new cogl, so if you upload it
now, it'll only be a matter of binNMUs when the new cogl lands in unstable.
I can NMU if you're too busy.
Thanks,
Emilio
diff -Nru mx-1.4.6/debian/changelog mx-1.4.6/debian/changelog
--- mx-1.4.6/debian/changelog 2012-05-16 14:41:13.000000000 +0200
+++ mx-1.4.6/debian/changelog 2013-05-26 18:09:40.000000000 +0200
@@ -1,3 +1,12 @@
+mx (1.4.6-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/01_cogl_gl_types.patch:
+ + New patch, don't use GL types as cogl doesn't expose GL headers
+ in newer releases. This will ease the cogl transition.
+
+ -- Emilio Pozuelo Monfort <[email protected]> Sun, 26 May 2013 18:08:50 +0200
+
mx (1.4.6-1) unstable; urgency=low
* New upstream release
diff -Nru mx-1.4.6/debian/patches/01_cogl_gl_types.patch
mx-1.4.6/debian/patches/01_cogl_gl_types.patch
--- mx-1.4.6/debian/patches/01_cogl_gl_types.patch 1970-01-01
01:00:00.000000000 +0100
+++ mx-1.4.6/debian/patches/01_cogl_gl_types.patch 2013-05-26
18:20:13.000000000 +0200
@@ -0,0 +1,36 @@
+--- a/mx/mx-deform-texture.c
++++ b/mx/mx-deform-texture.c
+@@ -493,9 +493,9 @@
+ static void
+ mx_deform_texture_init_arrays (MxDeformTexture *self)
+ {
+- GLushort *idx, *bf_idx;
++ gushort *idx, *bf_idx;
+ gint x, y, direction;
+- GLushort *static_indices, *static_bf_indices;
++ gushort *static_indices, *static_bf_indices;
+ MxDeformTexturePrivate *priv = self->priv;
+
+ mx_deform_texture_free_arrays (self);
+@@ -503,8 +503,8 @@
+ priv->n_indices = (2 + 2 * priv->tiles_x) *
+ priv->tiles_y +
+ (priv->tiles_y - 1);
+- static_indices = g_new (GLushort, priv->n_indices);
+- static_bf_indices = g_new (GLushort, priv->n_indices);
++ static_indices = g_new (gushort, priv->n_indices);
++ static_bf_indices = g_new (gushort, priv->n_indices);
+
+ #define MESH_INDEX(X, Y) (Y) * (priv->tiles_x + 1) + (X)
+
+--- a/mx/mx-texture-frame.c
++++ b/mx/mx-texture-frame.c
+@@ -200,7 +200,7 @@
+
+
+ {
+- GLfloat rectangles[] =
++ gfloat rectangles[] =
+ {
+ /* top left corner */
+ 0, 0,
diff -Nru mx-1.4.6/debian/patches/series mx-1.4.6/debian/patches/series
--- mx-1.4.6/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ mx-1.4.6/debian/patches/series 2013-05-26 18:06:58.000000000 +0200
@@ -0,0 +1 @@
+01_cogl_gl_types.patch
