Accepting request 36384 from GNOME:Factory
checked in (request 36384) OBS-URL: https://build.opensuse.org/request/show/36384 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=26
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
85637d44ce
commit
39721116a9
3
mutter-2.29.0.tar.bz2
Normal file
3
mutter-2.29.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7e4c1c46542f1251e9ec495729a3b753e5753ecd18fe35df586e474f6bf5ab90
|
||||
size 2001498
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:175f3adcc5ad5c6f23772ca15c862f275fc3d9a9c3104e9146cf265847a4a10a
|
||||
size 1981019
|
||||
88
mutter-cogl_texture-deprecated.patch
Normal file
88
mutter-cogl_texture-deprecated.patch
Normal 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;
|
||||
}
|
||||
|
||||
@ -1,15 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 19 09:01:56 CET 2010 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 2.29.1:
|
||||
+ Support and require Clutter 1.2
|
||||
+ Add meta_display_get_keybinding_action()
|
||||
+ Add meta_window_get_wm_class_instance()
|
||||
+ Remove workaround for bug fixed in intel driver Q2/2009 release
|
||||
+ Build fixes
|
||||
+ Updated translations.
|
||||
- Drop upstreamed patch mutter-cogl_texture-deprecated.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 25 21:32:53 UTC 2010 - dominique.leuenberger@tmf-group.com
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package mutter (Version 2.29.1)
|
||||
# spec file for package mutter (Version 2.29.0)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -33,10 +33,12 @@ BuildRequires: update-desktop-files
|
||||
BuildRequires: zenity
|
||||
License: GPLv2+
|
||||
Group: System/GUI/GNOME
|
||||
Version: 2.29.1
|
||||
Version: 2.29.0
|
||||
Release: 1
|
||||
Summary: Window and compositing manager based on Clutter
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
# 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
|
||||
@ -66,6 +68,7 @@ to develop applications that require these.
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user