[packages/mutter] Update to 3.12.0
megabajt
megabajt at pld-linux.org
Sat Mar 29 21:37:18 CET 2014
commit 87f9b1908e458318fa0679b3d569a5c99e968359
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date: Sat Mar 29 21:37:02 2014 +0100
Update to 3.12.0
cogl-1.17.patch | 134 --------------------------------------------------------
mutter.spec | 20 ++++-----
2 files changed, 9 insertions(+), 145 deletions(-)
---
diff --git a/mutter.spec b/mutter.spec
index e935099..eca640f 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -5,19 +5,18 @@
Summary: Window and compositing manager based on Clutter
Summary(pl.UTF-8): Zarządca okien i składania oparty na bibliotece Clutter
Name: mutter
-Version: 3.10.4
-Release: 2
+Version: 3.12.0
+Release: 1
License: GPL v2+
Group: X11/Window Managers
-Source0: http://ftp.gnome.org/pub/GNOME/sources/mutter/3.10/%{name}-%{version}.tar.xz
-# Source0-md5: e25602e010097aa44611da102c514c7c
-Patch0: cogl-1.17.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/mutter/3.12/%{name}-%{version}.tar.xz
+# Source0-md5: 12bd2f1e49430705e029825901b60704
URL: http://git.gnome.org/cgit/mutter
BuildRequires: autoconf >= 2.50
BuildRequires: automake >= 1:1.11
BuildRequires: cairo-devel >= 1.10
BuildRequires: clutter-devel >= 1.15.90
-BuildRequires: cogl-devel >= 1.15.6
+BuildRequires: cogl-devel >= 1.18.0
BuildRequires: gdk-pixbuf2-devel
BuildRequires: gettext-devel
BuildRequires: glib2-devel >= 1:2.26.0
@@ -35,7 +34,7 @@ BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.98
BuildRequires: startup-notification-devel >= 0.7
BuildRequires: tar >= 1:1.22
-BuildRequires: upower-devel >= 0.9.12
+BuildRequires: upower-devel >= 0.99.0
BuildRequires: xorg-lib-libICE-devel
BuildRequires: xorg-lib-libSM-devel
BuildRequires: xorg-lib-libX11-devel
@@ -74,13 +73,13 @@ Summary(pl.UTF-8): Biblioteka współdzielona zarządcy okien Mutter
Group: Libraries
Requires: cairo >= 1.10
Requires: clutter >= 1.15.90
-Requires: cogl >= 1.15.6
+Requires: cogl >= 1.18.0
Requires: glib2 >= 1:2.26.0
Requires: gnome-desktop >= 3.0
Requires: gtk+3 >= 3.9.11
Requires: libcanberra-gtk3 >= 0.26
Requires: startup-notification >= 0.7
-Requires: upower-libs >= 0.9.12
+Requires: upower-libs >= 0.99.0
Requires: xorg-lib-libXcomposite >= 0.2
Requires: xorg-lib-libXi >= 1.6
Conflicts: mutter < 3.4.0-2
@@ -98,7 +97,7 @@ Group: X11/Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: cairo-devel >= 1.10
Requires: clutter-devel >= 1.15.90
-Requires: cogl-devel >= 1.15.6
+Requires: cogl-devel >= 1.18.0
Requires: glib2-devel >= 1:2.26.0
Requires: gtk+3-devel >= 3.9.11
Requires: libcanberra-gtk3-devel >= 0.26
@@ -130,7 +129,6 @@ Dokumentacja API Mutter (Meta).
%prep
%setup -q
-%patch0 -p1
%build
%{__intltoolize}
diff --git a/cogl-1.17.patch b/cogl-1.17.patch
deleted file mode 100644
index 4926c7e..0000000
--- a/cogl-1.17.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c
-index cd585b5..3fc9430 100644
---- a/src/compositor/meta-texture-rectangle.c
-+++ b/src/compositor/meta-texture-rectangle.c
-@@ -26,41 +26,6 @@
- #include <clutter/clutter.h>
- #include "meta-texture-rectangle.h"
-
--CoglTexture *
--meta_texture_rectangle_new (unsigned int width,
-- unsigned int height,
-- CoglPixelFormat format,
-- CoglPixelFormat internal_format,
-- unsigned int rowstride,
-- const guint8 *data,
-- GError **error)
--{
-- ClutterBackend *backend =
-- clutter_get_default_backend ();
-- CoglContext *context =
-- clutter_backend_get_cogl_context (backend);
-- CoglTextureRectangle *tex_rect;
--
-- tex_rect = cogl_texture_rectangle_new_with_size (context,
-- width, height,
-- internal_format,
-- error);
-- if (tex_rect == NULL)
-- return NULL;
--
-- if (data)
-- cogl_texture_set_region (COGL_TEXTURE (tex_rect),
-- 0, 0, /* src_x/y */
-- 0, 0, /* dst_x/y */
-- width, height, /* dst_width/height */
-- width, height, /* width/height */
-- format,
-- rowstride,
-- data);
--
-- return COGL_TEXTURE (tex_rect);
--}
--
- static void
- texture_rectangle_check_cb (CoglTexture *sub_texture,
- const float *sub_texture_coords,
-diff --git a/src/compositor/meta-texture-rectangle.h b/src/compositor/meta-texture-rectangle.h
-index ba2624f..30f60d3 100644
---- a/src/compositor/meta-texture-rectangle.h
-+++ b/src/compositor/meta-texture-rectangle.h
-@@ -28,15 +28,6 @@
-
- G_BEGIN_DECLS
-
--CoglTexture *
--meta_texture_rectangle_new (unsigned int width,
-- unsigned int height,
-- CoglPixelFormat format,
-- CoglPixelFormat internal_format,
-- unsigned int rowstride,
-- const guint8 *data,
-- GError **error);
--
- gboolean
- meta_texture_rectangle_check (CoglTexture *texture);
-
-diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c
-index 5d82add..9a30de0 100644
---- a/src/compositor/meta-texture-tower.c
-+++ b/src/compositor/meta-texture-tower.c
-@@ -359,18 +359,10 @@ texture_tower_create_texture (MetaTextureTower *tower,
- if ((!is_power_of_two (width) || !is_power_of_two (height)) &&
- meta_texture_rectangle_check (tower->textures[level - 1]))
- {
-- tower->textures[level] =
-- meta_texture_rectangle_new (width, height,
-- /* data format */
-- TEXTURE_FORMAT,
-- /* internal cogl format */
-- TEXTURE_FORMAT,
-- /* rowstride */
-- width * 4,
-- /* data */
-- NULL,
-- /* error */
-- NULL);
-+ ClutterBackend *backend = clutter_get_default_backend ();
-+ CoglContext *context = clutter_backend_get_cogl_context (backend);
-+
-+ tower->textures[level] = cogl_texture_rectangle_new_with_size (context, width, height);
- }
- else
- {
-diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
-index b9473d2..a2c05ca 100644
---- a/src/compositor/meta-window-actor.c
-+++ b/src/compositor/meta-window-actor.c
-@@ -2165,12 +2165,18 @@ build_and_scan_frame_mask (MetaWindowActor *self,
-
- if (meta_texture_rectangle_check (paint_tex))
- {
-- mask_texture = meta_texture_rectangle_new (tex_width, tex_height,
-- COGL_PIXEL_FORMAT_A_8,
-- COGL_PIXEL_FORMAT_A_8,
-- stride,
-- mask_data,
-- NULL /* error */);
-+ ClutterBackend *backend = clutter_get_default_backend ();
-+ CoglContext *context = clutter_backend_get_cogl_context (backend);
-+
-+ mask_texture = COGL_TEXTURE (cogl_texture_rectangle_new_with_size (context, tex_width, tex_height));
-+ cogl_texture_set_components (mask_texture, COGL_TEXTURE_COMPONENTS_A);
-+ cogl_texture_set_region (mask_texture,
-+ 0, 0, /* src_x/y */
-+ 0, 0, /* dst_x/y */
-+ tex_width, tex_height, /* dst_width/height */
-+ tex_width, tex_height, /* width/height */
-+ COGL_PIXEL_FORMAT_A_8,
-+ stride, mask_data);
- }
- else
- {
-diff --git a/src/core/meta-cursor-tracker.c b/src/core/meta-cursor-tracker.c
-index 84f3185..d1b365e 100644
---- a/src/core/meta-cursor-tracker.c
-+++ b/src/core/meta-cursor-tracker.c
-@@ -307,7 +307,6 @@ ensure_xfixes_cursor (MetaCursorTracker *tracker)
- cursor_image->width,
- cursor_image->height,
- CLUTTER_CAIRO_FORMAT_ARGB32,
-- COGL_PIXEL_FORMAT_ANY,
- cursor_image->width * 4, /* stride */
- cursor_data,
- NULL);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mutter.git/commitdiff/87f9b1908e458318fa0679b3d569a5c99e968359
More information about the pld-cvs-commit
mailing list