[muffin] patch for new cogl .so version

[leigh123linux]

commit bc34ed88ab286441861f1c96f0e47b48698921f5
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Feb 6 14:22:48 2014 +0000

    patch for new cogl .so version

 cogl_ABI.patch |   72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 muffin.spec    |    7 ++++-
 2 files changed, 77 insertions(+), 2 deletions(-)
---
diff --git a/cogl_ABI.patch b/cogl_ABI.patch
new file mode 100644
index 0000000..fc42c46
--- /dev/null
+++ b/cogl_ABI.patch
@@ -0,0 +1,72 @@
+From d2a1db8834bf0a9007bf6924b006a6f2c94ce88d Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre at mecheye.net>
+Date: Mon, 13 Jan 2014 18:03:19 +0000
+Subject: Update for Cogl API breaks
+
+---
+(limited to 'src/compositor')
+
+diff --git a/src/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c
+index 3fc9430..450155d 100644
+--- a/src/compositor/meta-texture-rectangle.c
++++ b/src/compositor/meta-texture-rectangle.c
+@@ -35,10 +35,8 @@ CoglTexture *
+ meta_texture_rectangle_new (unsigned int width,
+                             unsigned int height,
+                             CoglPixelFormat format,
+-                            CoglPixelFormat internal_format,
+                             unsigned int rowstride,
+-                            const guint8 *data,
+-                            GError **error)
++                            const guint8 *data)
+ {
+   ClutterBackend *backend =
+     clutter_get_default_backend ();
+@@ -46,10 +44,7 @@ meta_texture_rectangle_new (unsigned int width,
+     clutter_backend_get_cogl_context (backend);
+   CoglTextureRectangle *tex_rect;
+ 
+-  tex_rect = cogl_texture_rectangle_new_with_size (context,
+-                                                   width, height,
+-                                                   internal_format,
+-                                                   error);
++  tex_rect = cogl_texture_rectangle_new_with_size (context, width, height);
+   if (tex_rect == NULL)
+     return NULL;
+ 
+diff --git a/src/compositor/meta-texture-rectangle.h b/src/compositor/meta-texture-rectangle.h
+index 30f60d3..7b84229 100644
+--- a/src/compositor/meta-texture-rectangle.h
++++ b/src/compositor/meta-texture-rectangle.h
+@@ -34,10 +34,8 @@ CoglTexture *
+ meta_texture_rectangle_new (unsigned int width,
+                             unsigned int height,
+                             CoglPixelFormat format,
+-                            CoglPixelFormat internal_format,
+                             unsigned int rowstride,
+-                            const guint8 *data,
+-                            GError **error);
++                            const guint8 *data);
+ 
+ gboolean
+ meta_texture_rectangle_check (CoglTexture *texture);
+diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c
+index 9a30de0..019aaf4 100644
+--- a/src/compositor/meta-texture-tower.c
++++ b/src/compositor/meta-texture-tower.c
+@@ -365,13 +365,9 @@ texture_tower_create_texture (MetaTextureTower *tower,
+         meta_texture_rectangle_new (width, height,
+                                     /* data format */
+                                     TEXTURE_FORMAT,
+-                                    /* internal cogl format */
+-                                    TEXTURE_FORMAT,
+                                     /* rowstride */
+                                     width * 4,
+                                     /* data */
+-                                    NULL,
+-                                    /* error */
+                                     NULL);
+     }
+   else
+--
+cgit v0.9.2
diff --git a/muffin.spec b/muffin.spec
index 36b1962..afa88b5 100644
--- a/muffin.spec
+++ b/muffin.spec
@@ -14,7 +14,9 @@ URL:           https://github.com/linuxmint/muffin
 # for git
 # wget https://github.com/linuxmint/muffin/tarball/%%{_internal_version} -O muffin-%%{version}.git%%{_internal_version}.tar.gz
 Source0:       http://leigh123linux.fedorapeople.org/pub/muffin/source/muffin-%{version}.tar.gz
-
+%if 0%{?fedora} > 20
+Patch0:        cogl_ABI.patch
+%endif
 
 BuildRequires: pkgconfig(clutter-1.0) >= 1.7.5
 BuildRequires: pkgconfig(sm)
@@ -54,7 +56,8 @@ Header files and libraries for developing Muffin plugins. Also includes
 utilities for testing Metacity/Muffin themes.
 
 %prep
-%setup -q
+%autosetup -p1
+
 sed -i -e 's@{ACLOCAL_FLAGS}@{ACLOCAL_FLAGS} -I m4 at g' Makefile.am
 sed -i -e 's at configure.in@configure.ac at g' autogen.sh
 echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in