rpm/mutter
SHA256
1
0
Fork 0
forked from pool/mutter
Code Pull Requests Activity

checked in (request 32291)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=19
This commit is contained in:
OBS User autobuild 2010-02-11 19:59:10 +00:00 committed by Git OBS Bridge
parent efe0dcab3b
commit 47f7a3c040
4 changed files with 0 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mutter-fix-build.patch
View File

@ -1,36 +0,0 @@
From e14132b8269e4b2ff1194e2d3412198e7d8168f1 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 3 Feb 2010 14:17:10 -0500
Subject: [PATCH] [introspection] Include xlib.gir
We need this for KeySym at least.
https://bugzilla.gnome.org/show_bug.cgi?id=607125
---
src/Makefile.am | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
Index: mutter-2.28.0/src/Makefile.am
===================================================================
--- mutter-2.28.0.orig/src/Makefile.am
+++ mutter-2.28.0/src/Makefile.am
@@ -212,6 +212,7 @@ Meta-$(api_version).gir: $(G_IR_SCANNER)
--include=Clutter-1.0 \
--pkg=clutter-1.0 \
--pkg=gtk+-2.0 \
+ --include=xlib-2.0 \
--include=xfixes-4.0 \
--program=$$pwd/mutter \
$(filter %.c,$(mutter_SOURCES)) \
Index: mutter-2.28.0/src/Makefile.in
===================================================================
--- mutter-2.28.0.orig/src/Makefile.in
+++ mutter-2.28.0/src/Makefile.in
@@ -2242,6 +2242,7 @@ uninstall-am: uninstall-binPROGRAMS unin
@WITH_INTROSPECTION_TRUE@ --include=Clutter-1.0 \
@WITH_INTROSPECTION_TRUE@ --pkg=clutter-1.0 \
@WITH_INTROSPECTION_TRUE@ --pkg=gtk+-2.0 \
+@WITH_INTROSPECTION_TRUE@ --include=xlib-2.0 \
@WITH_INTROSPECTION_TRUE@ --include=xfixes-4.0 \
@WITH_INTROSPECTION_TRUE@ --program=$$pwd/mutter \
@WITH_INTROSPECTION_TRUE@ $(filter %.c,$(mutter_SOURCES)) \

41
mutter-gl-no-cgl.patch
View File

@ -1,41 +0,0 @@
Index: mutter-2.28.0/src/compositor/mutter-shaped-texture.c
===================================================================
--- mutter-2.28.0.orig/src/compositor/mutter-shaped-texture.c
+++ mutter-2.28.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);

6
mutter.changes
View File

@ -1,9 +1,3 @@
-------------------------------------------------------------------
Wed Feb 3 20:31:43 CET 2010 - vuntz@opensuse.org
- Add mutter-fix-build.patch and mutter-gl-no-cgl.patch to fix the
build with recent introspection data and with recent clutter.
-------------------------------------------------------------------
Wed Dec 2 12:04:17 CET 2009 - vuntz@opensuse.org

6
mutter.spec
View File

@ -36,10 +36,6 @@ Version: 2.28.0
Release: 2
Summary: Window and compositing manager based on Clutter
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM mutter-fix-build.patch bgo607125 vuntz@opensuse.org -- Fix build with latest introspection data
Patch0: mutter-fix-build.patch
# PATCH-FIX-UPSTREAM mutter-gl-no-cgl.patch vuntz@opensuse.org -- Fix build with latest clutter, taken from upstream
Patch1: mutter-gl-no-cgl.patch
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: zenity
@ -67,8 +63,6 @@ to develop applications that require these.
%lang_package
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%configure \