pool/mutter
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 33769 from GNOME:Factory

Browse Source 
Copy from GNOME:Factory/mutter based on submit request 33769 from user dimstar

OBS-URL: https://build.opensuse.org/request/show/33769
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutter?expand=0&rev=11
This commit is contained in:
OBS User autobuild 2010-03-02 11:42:58 +00:00 committed by Git OBS Bridge
commit 49e0a3d0ec
8 changed files with 167 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mutter-2.28.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f1917172fa4fa622dcc2aa1d82a6c4796c2981566a5c9dc1df7da2a38cd8da80
size 1986736

3
mutter-2.29.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e4c1c46542f1251e9ec495729a3b753e5753ecd18fe35df586e474f6bf5ab90
size 2001498

88
mutter-cogl_texture-deprecated.patch Normal file
View File

@ -0,0 +1,88 @@
Index: mutter-2.29.0/src/compositor/mutter-shaped-texture.c
===================================================================
--- mutter-2.29.0.orig/src/compositor/mutter-shaped-texture.c
+++ mutter-2.29.0/src/compositor/mutter-shaped-texture.c
@@ -124,18 +124,18 @@ mutter_shaped_texture_dispose (GObject *
if (priv->material != COGL_INVALID_HANDLE)
{
- cogl_material_unref (priv->material);
+ cogl_handle_unref (priv->material);
priv->material = COGL_INVALID_HANDLE;
}
if (priv->material_unshaped != COGL_INVALID_HANDLE)
{
- cogl_material_unref (priv->material_unshaped);
+ cogl_handle_unref (priv->material_unshaped);
priv->material_unshaped = COGL_INVALID_HANDLE;
}
#if 1 /* see comment in mutter_shaped_texture_paint */
if (priv->material_workaround != COGL_INVALID_HANDLE)
{
- cogl_material_unref (priv->material_workaround);
+ cogl_handle_unref (priv->material_workaround);
priv->material_workaround = COGL_INVALID_HANDLE;
}
#endif
@@ -194,7 +194,7 @@ mutter_shaped_texture_dirty_mask (Mutter
if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB)
glDeleteTextures (1, &mask_gl_tex);
- cogl_texture_unref (priv->mask_texture);
+ cogl_handle_unref (priv->mask_texture);
priv->mask_texture = COGL_INVALID_HANDLE;
}
}
Index: mutter-2.29.0/src/compositor/mutter-texture-tower.c
===================================================================
--- mutter-2.29.0.orig/src/compositor/mutter-texture-tower.c
+++ mutter-2.29.0/src/compositor/mutter-texture-tower.c
@@ -131,7 +131,7 @@ free_texture (CoglHandle texture)
if (gl_target == GL_TEXTURE_RECTANGLE_ARB)
glDeleteTextures (1, &gl_tex);
- cogl_texture_unref (texture);
+ cogl_handle_unref (texture);
}
/**
@@ -180,7 +180,7 @@ mutter_texture_tower_set_base_texture (M
#endif
}
- cogl_texture_unref (tower->textures[0]);
+ cogl_handle_unref (tower->textures[0]);
}
tower->textures[0] = texture;
@@ -189,7 +189,7 @@ mutter_texture_tower_set_base_texture (M
{
int width, height;
- cogl_texture_ref (tower->textures[0]);
+ cogl_handle_ref (tower->textures[0]);
width = cogl_texture_get_width (tower->textures[0]);
height = cogl_texture_get_height (tower->textures[0]);
Index: mutter-2.29.0/src/compositor/tidy/tidy-texture-frame.c
===================================================================
--- mutter-2.29.0.orig/src/compositor/tidy/tidy-texture-frame.c
+++ mutter-2.29.0/src/compositor/tidy/tidy-texture-frame.c
@@ -155,7 +155,7 @@ tidy_texture_frame_unrealize (ClutterAct
if (priv->material == COGL_INVALID_HANDLE)
return;
- cogl_material_unref (priv->material);
+ cogl_handle_unref (priv->material);
priv->material = COGL_INVALID_HANDLE;
CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
@@ -415,7 +415,7 @@ tidy_texture_frame_dispose (GObject *gob
if (priv->material)
{
- cogl_material_unref (priv->material);
+ cogl_handle_unref (priv->material);
priv->material = COGL_INVALID_HANDLE;
}

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)) \

39
mutter-gcc45.patch Normal file
View File

@ -0,0 +1,39 @@
Index: mutter-2.29.0/src/core/core.c
===================================================================
--- mutter-2.29.0.orig/src/core/core.c
+++ mutter-2.29.0/src/core/core.c
@@ -526,6 +526,9 @@ meta_core_get_menu_accelerator (MetaMenu
switch (menu_op)
{
+ case META_MENU_OP_NONE:
+ /* No keybindings needed here */
+ break;
case META_MENU_OP_DELETE:
name = "close";
break;
Index: mutter-2.29.0/src/include/common.h
===================================================================
--- mutter-2.29.0.orig/src/include/common.h
+++ mutter-2.29.0/src/include/common.h
@@ -52,6 +52,7 @@ typedef enum
typedef enum
{
+ META_MENU_OP_NONE = 0,
META_MENU_OP_DELETE = 1 << 0,
META_MENU_OP_MINIMIZE = 1 << 1,
META_MENU_OP_UNMAXIMIZE = 1 << 2,
Index: mutter-2.29.0/src/core/window.c
===================================================================
--- mutter-2.29.0.orig/src/core/window.c
+++ mutter-2.29.0/src/core/window.c
@@ -7157,7 +7157,7 @@ menu_callback (MetaWindowMenu *menu,
meta_window_shove_titlebar_onscreen (window);
break;
- case 0:
+ case META_MENU_OP_NONE:
/* nothing */
break;

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);

29
mutter.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Thu Feb 25 21:32:53 UTC 2010 - dominique.leuenberger@tmf-group.com
- Refresh mutter-cogl_texture-deprecated.patch to also take care
of cogl_material_[un]ref, which is deprecated with clutter
1.1.14.
-------------------------------------------------------------------
Fri Feb 19 11:17:36 CET 2010 - dimstar@opensuse.org
- Update to version 2.29.0:
+ Improve appearance of scaled down windows using mipmap
emulation
+ Added signals: MetaDisplay::window-created,
MetaDisplay::window-marked-urgent,
MetaDisplay::window-demands-attention, MetaWindow::unmanaged
+ Added properties: MetaWindow:demands-attention,
MetaWindow:urgent, MetaWindow:maximized-horizontally,
MetaWindow:maximized-vertically
+ Fix nasty crash when workspace "struts" changed during a window
move
+ Bug fixes
+ Build fixes
+ Merge Metacity changes since 2.26. Includes themable sound
support via libcanberra
- BuildRequire libcanberra-devel for new themable sounds.
- Add mutter-cogl_texture-deprecated.patch to fix build against
clutter 1.1.12. Reported upstream as bgo#610454.
-------------------------------------------------------------------
Wed Feb 3 20:31:43 CET 2010 - vuntz@opensuse.org

15
mutter.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package mutter (Version 2.28.0)
# spec file for package mutter (Version 2.29.0)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -27,19 +27,20 @@ BuildRequires: gnome-doc-utils-devel
BuildRequires: gobject-introspection-devel
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: libcanberra-devel
BuildRequires: startup-notification-devel
BuildRequires: update-desktop-files
BuildRequires: zenity
License: GPLv2+
Group: System/GUI/GNOME
Version: 2.28.0
Release: 3
Version: 2.29.0
Release: 1
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
# PATCH-FIX-UPSTREAM mutter-cogl_texture-deprecated.patch bgo#610454 dimstar@opensuse.org -- cogl_texture_[un]ref has been deprecated in favor of cogl_handle_[un]ref.
Patch0: mutter-cogl_texture-deprecated.patch
# PATCH-FIX-UPSTREAM mutter-gcc45.patch bgo#606719 dimstar@opensuse.org -- Fix build with GCC 4.5
Patch1: mutter-gcc45.patch
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: zenity