diff -u mutter-2.31.5/debian/changelog mutter-2.31.5/debian/changelog --- mutter-2.31.5/debian/changelog +++ mutter-2.31.5/debian/changelog @@ -1,3 +1,13 @@ +mutter (2.31.5-0ubuntu9alf3) maverick; urgency=low + + * debian/patches/51_disable_mask_texture.patch: + - Disable the mask texture to enable mutter to work with + clutter eglx texture-from-pixmap: Because of missing GLES2 NPOT support + in clutter, the mask texture ends up being a sliced texture and cannot + be used for multi-texturing. + + -- Alexandros Frantzis Thu, 11 Nov 2010 15:08:03 +0200 + mutter (2.31.5-0ubuntu9alf2) maverick; urgency=low * debian/control, debian/control.in: diff -u mutter-2.31.5/debian/patches/series mutter-2.31.5/debian/patches/series --- mutter-2.31.5/debian/patches/series +++ mutter-2.31.5/debian/patches/series @@ -13,6 +13,7 @@ 17_add_overlay_key_signals.patch 18_unmimize.patch 50_texture_rectangle.patch +51_disable_mask_texture.patch 91_add_window_groups.patch 92_handle_event_mask_when_managing_window.patch 95_workaround_gdk_compat.patch only in patch2: unchanged: --- mutter-2.31.5.orig/debian/patches/51_disable_mask_texture.patch +++ mutter-2.31.5/debian/patches/51_disable_mask_texture.patch @@ -0,0 +1,26 @@ +Description: Disable the mask texture to enable mutter to work with + clutter eglx texture-from-pixmap: Because of missing GLES2 NPOT support in + clutter, the mask texture ends up being a sliced texture and cannot be + used for multi-texturing. +Author: Alexandros Frantzis +Last-Updated: 2010-11-11 +--- a/src/compositor/mutter-shaped-texture.c 2010-09-23 07:54:46 +0000 ++++ b/src/compositor/mutter-shaped-texture.c 2010-11-11 11:13:50 +0000 +@@ -354,13 +354,13 @@ + { + priv->material = cogl_material_new (); + +- cogl_material_set_layer_combine (priv->material, 1, ++ /* cogl_material_set_layer_combine (priv->material, 1, + "RGBA = MODULATE (PREVIOUS, TEXTURE[A])", +- NULL); ++ NULL); */ + } + material = priv->material; + +- cogl_material_set_layer (material, 1, priv->mask_texture); ++ /*cogl_material_set_layer (material, 1, priv->mask_texture);*/ + } + + cogl_material_set_layer (material, 0, paint_tex); +