sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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 <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2011-05-14 21:24:07 -07:00 committed by Richard Purdie
parent 6b8f0097ea
commit 9e45491318
4 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-graphics/mutter/mutter.inc
View File

@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter."
LICENSE = "GPLv2"
DEPENDS = "startup-notification gtk+ gconf clutter-1.4 gdk-pixbuf-native intltool glib-2.0-native"
DEPENDS = "startup-notification gtk+ gconf clutter-1.6 gdk-pixbuf-native intltool glib-2.0-native"
# gobject-introspection
inherit gnome update-alternatives

47
meta/recipes-graphics/mutter/mutter/fix_CGL_TEXTURE_RECTANGLE_ARB.patch Normal file
View File

@ -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 <sgw@linux.intel.com>
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);

9
meta/recipes-graphics/mutter/mutter_2.28.1.bb
View File

@ -1,11 +1,14 @@
require mutter.inc
PR = "r1"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
SRC_URI = "http://download.moblin.org/sources/mutter/2.28/mutter-2.28.1_0.0.tar.bz2 \
file://nodocs.patch;patch=1 \
file://nozenity.patch;patch=1 \
file://fix_pkgconfig.patch;patch=1 \
file://nodocs.patch \
file://nozenity.patch \
file://fix_pkgconfig.patch \
file://fix_CGL_TEXTURE_RECTANGLE_ARB.patch \
"
S = "${WORKDIR}/mutter-2.28.1_0.0"

1
meta/recipes-graphics/mutter/mutter_git.bb
View File

@ -18,3 +18,4 @@ SRC_URI = "git://git.moblin.org/mutter.git;protocol=git;branch=master \
"
S = "${WORKDIR}/git"
DEFAULT_PREFERENCE = "-1"