From 9e45491318ea7facbf1f517250e22f701245bba6 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Sat, 14 May 2011 21:24:07 -0700 Subject: mutter: Recipe Update for clutter 1.6 update set DEFAULT_PREFERENCE to -1 for git recipe Update from clutter-1.4 to clutter-1.6 add fix_CGL_TEXTURE_RECTANGLE_ARB.patch (From OE-Core rev: 35fa3f8c89104275870db9baa9d094232b1e7bfd) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch (limited to 'meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch') diff --git a/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch b/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch new file mode 100644 index 0000000000..13197e5703 --- /dev/null +++ b/meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch @@ -0,0 +1,47 @@ +Update the usage of CGL_TEXTURE_RECTANGLE_ARB to GL_TEXTURE_RECTANGLE_ARB + +Upstream-Status: Pending + +Signed-off-by: Saul Wold + +Index: mutter-2.28.1_0.0/src/compositor/mutter-shaped-texture.c +=================================================================== +--- mutter-2.28.1_0.0.orig/src/compositor/mutter-shaped-texture.c ++++ mutter-2.28.1_0.0/src/compositor/mutter-shaped-texture.c +@@ -151,7 +151,7 @@ mutter_shaped_texture_dirty_mask (Mutter + cogl_texture_get_gl_texture (priv->mask_texture, + &mask_gl_tex, &mask_gl_target); + +- if (mask_gl_target == CGL_TEXTURE_RECTANGLE_ARB) ++ if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB) + glDeleteTextures (1, &mask_gl_tex); + + cogl_texture_unref (priv->mask_texture); +@@ -214,23 +214,23 @@ mutter_shaped_texture_ensure_mask (Mutte + + cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target); + +- if (paint_gl_target == CGL_TEXTURE_RECTANGLE_ARB) ++ if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB) + { + GLuint tex; + + glGenTextures (1, &tex); +- glBindTexture (CGL_TEXTURE_RECTANGLE_ARB, tex); ++ glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex); + glPixelStorei (GL_UNPACK_ROW_LENGTH, tex_width); + glPixelStorei (GL_UNPACK_ALIGNMENT, 1); + glPixelStorei (GL_UNPACK_SKIP_ROWS, 0); + glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0); +- glTexImage2D (CGL_TEXTURE_RECTANGLE_ARB, 0, ++ glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, + GL_ALPHA, tex_width, tex_height, + 0, GL_ALPHA, GL_UNSIGNED_BYTE, mask_data); + + priv->mask_texture + = cogl_texture_new_from_foreign (tex, +- CGL_TEXTURE_RECTANGLE_ARB, ++ GL_TEXTURE_RECTANGLE_ARB, + tex_width, tex_height, + 0, 0, + COGL_PIXEL_FORMAT_A_8); -- cgit v1.2.3-54-g00ecf