[arch-commits] Commit in muffin/repos (14 files)
Alexandre Filgueira
faidoc at nymeria.archlinux.org
Sat Apr 12 19:17:21 UTC 2014
Date: Saturday, April 12, 2014 @ 21:17:21
Author: faidoc
Revision: 109281
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
muffin/repos/community-testing-i686/PKGBUILD
(from rev 109280, muffin/trunk/PKGBUILD)
muffin/repos/community-testing-i686/cogl_ABI.patch
(from rev 109280, muffin/trunk/cogl_ABI.patch)
muffin/repos/community-testing-i686/muffin.install
(from rev 109280, muffin/trunk/muffin.install)
muffin/repos/community-testing-x86_64/PKGBUILD
(from rev 109280, muffin/trunk/PKGBUILD)
muffin/repos/community-testing-x86_64/cogl_ABI.patch
(from rev 109280, muffin/trunk/cogl_ABI.patch)
muffin/repos/community-testing-x86_64/muffin.install
(from rev 109280, muffin/trunk/muffin.install)
Deleted:
muffin/repos/community-testing-i686/PKGBUILD
muffin/repos/community-testing-i686/cogl_ABI.patch
muffin/repos/community-testing-i686/gtkdoc.patch
muffin/repos/community-testing-i686/muffin.install
muffin/repos/community-testing-x86_64/PKGBUILD
muffin/repos/community-testing-x86_64/cogl_ABI.patch
muffin/repos/community-testing-x86_64/gtkdoc.patch
muffin/repos/community-testing-x86_64/muffin.install
-----------------------------------------+
/PKGBUILD | 88 +++++++++++++++
/cogl_ABI.patch | 172 ++++++++++++++++++++++++++++++
/muffin.install | 20 +++
community-testing-i686/PKGBUILD | 49 --------
community-testing-i686/cogl_ABI.patch | 86 ---------------
community-testing-i686/gtkdoc.patch | 41 -------
community-testing-i686/muffin.install | 10 -
community-testing-x86_64/PKGBUILD | 49 --------
community-testing-x86_64/cogl_ABI.patch | 86 ---------------
community-testing-x86_64/gtkdoc.patch | 41 -------
community-testing-x86_64/muffin.install | 10 -
11 files changed, 280 insertions(+), 372 deletions(-)
Deleted: community-testing-i686/PKGBUILD
===================================================================
--- community-testing-i686/PKGBUILD 2014-04-12 19:16:05 UTC (rev 109280)
+++ community-testing-i686/PKGBUILD 2014-04-12 19:17:21 UTC (rev 109281)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Contributor: Adam Hani Schakaki <adam at schakaki.net>
-# Contributor: Ner0
-
-pkgname=muffin
-pkgver=2.0.5
-pkgrel=3
-pkgdesc="Cinnamon window manager based on Mutter"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxmint/muffin"
-license=('GPL')
-depends=('clutter' 'gobject-introspection' 'cinnamon-desktop' 'libcanberra'
- 'startup-notification' 'zenity' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
-options=('!emptydirs')
-install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
- cogl_ABI.patch
- gtkdoc.patch)
-sha256sums=('81a57d452ea88ea926b284248033f021960400b3b9d13f5a334a77cf3bd4c7ee'
- 'bce6cf03f7d635345db8a664084b98122aa23802867c7e6e4573273ffccc01e5'
- '4f7deff60dc65557aefb9f0473bcc58a7c33c0d25ed6ebfcdd6602f7e1639caa')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- # Port to cogl 1.18
- patch -Np1 -i ../cogl_ABI.patch
-
- # Build fix
- patch -Np1 -i ../gtkdoc.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
- --localstatedir=/var --disable-static --disable-schemas-compile \
- --enable-compile-warnings=minimum
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: muffin/repos/community-testing-i686/PKGBUILD (from rev 109280, muffin/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2014-04-12 19:17:21 UTC (rev 109281)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Contributor: Adam Hani Schakaki <adam at schakaki.net>
+# Contributor: Ner0
+
+pkgname=muffin
+pkgver=2.2.0
+pkgrel=1
+pkgdesc="Cinnamon window manager based on Mutter"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxmint/muffin"
+license=('GPL')
+depends=('clutter' 'gobject-introspection' 'cinnamon-desktop' 'libcanberra'
+ 'startup-notification' 'zenity' 'dconf')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
+options=('!emptydirs')
+install=$pkgname.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
+ cogl_ABI.patch)
+sha256sums=('85332899ff4f441624b145af6ee9689dbab1d4b824517a35d01cc563bede9737'
+ 'bce6cf03f7d635345db8a664084b98122aa23802867c7e6e4573273ffccc01e5')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # Port to cogl 1.18
+ patch -Np1 -i ../cogl_ABI.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
+ --localstatedir=/var --disable-static --disable-schemas-compile \
+ --enable-compile-warnings=minimum
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-testing-i686/cogl_ABI.patch
===================================================================
--- community-testing-i686/cogl_ABI.patch 2014-04-12 19:16:05 UTC (rev 109280)
+++ community-testing-i686/cogl_ABI.patch 2014-04-12 19:17:21 UTC (rev 109281)
@@ -1,86 +0,0 @@
-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
---- a/src/compositor/meta-shaped-texture.c
-+++ b/src/compositor/meta-shaped-texture.c
-@@ -295,10 +295,7 @@ meta_shaped_texture_ensure_mask (MetaSha
- if (meta_texture_rectangle_check (paint_tex))
- priv->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 */);
-+ stride, mask_data);
- else
- priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
- COGL_TEXTURE_NONE,
---
-cgit v0.9.2
Copied: muffin/repos/community-testing-i686/cogl_ABI.patch (from rev 109280, muffin/trunk/cogl_ABI.patch)
===================================================================
--- community-testing-i686/cogl_ABI.patch (rev 0)
+++ community-testing-i686/cogl_ABI.patch 2014-04-12 19:17:21 UTC (rev 109281)
@@ -0,0 +1,86 @@
+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
+--- a/src/compositor/meta-shaped-texture.c
++++ b/src/compositor/meta-shaped-texture.c
+@@ -295,10 +295,7 @@ meta_shaped_texture_ensure_mask (MetaSha
+ if (meta_texture_rectangle_check (paint_tex))
+ priv->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 */);
++ stride, mask_data);
+ else
+ priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
+ COGL_TEXTURE_NONE,
+--
+cgit v0.9.2
Deleted: community-testing-i686/gtkdoc.patch
===================================================================
--- community-testing-i686/gtkdoc.patch 2014-04-12 19:16:05 UTC (rev 109280)
+++ community-testing-i686/gtkdoc.patch 2014-04-12 19:17:21 UTC (rev 109281)
@@ -1,41 +0,0 @@
---- a/src/meta/prefs.h
-+++ b/src/meta/prefs.h
-@@ -310,13 +310,13 @@ typedef struct
- */
- GSList *bindings;
-
-- /** for keybindings that can have shift or not like Alt+Tab */
-+ /* for keybindings that can have shift or not like Alt+Tab */
- gboolean add_shift:1;
-
-- /** for keybindings that apply only to a window */
-+ /* for keybindings that apply only to a window */
- gboolean per_window:1;
-
-- /** for keybindings not added with meta_display_add_keybinding() */
-+ /* for keybindings not added with meta_display_add_keybinding() */
- gboolean builtin:1;
- } MetaKeyPref;
-
-@@ -339,5 +339,3 @@ CDesktopVisualBellType meta_prefs_get_vi
- MetaPlacementMode meta_prefs_get_placement_mode (void);
-
- #endif
--
--
---- a/src/core/workspace.c
-+++ b/src/core/workspace.c
-@@ -194,7 +194,7 @@ meta_workspace_new (MetaScreen *screen)
- return workspace;
- }
-
--/** Foreach function for workspace_free_struts() */
-+/* Foreach function for workspace_free_struts() */
- static void
- free_this (gpointer candidate, gpointer dummy)
- {
-@@ -1390,4 +1390,3 @@ meta_workspace_get_screen (MetaWorkspace
- {
- return workspace->screen;
- }
--
Deleted: community-testing-i686/muffin.install
===================================================================
--- community-testing-i686/muffin.install 2014-04-12 19:16:05 UTC (rev 109280)
+++ community-testing-i686/muffin.install 2014-04-12 19:17:21 UTC (rev 109281)
@@ -1,10 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-post_remove() {
- post_install
-}
Copied: muffin/repos/community-testing-i686/muffin.install (from rev 109280, muffin/trunk/muffin.install)
===================================================================
--- community-testing-i686/muffin.install (rev 0)
+++ community-testing-i686/muffin.install 2014-04-12 19:17:21 UTC (rev 109281)
@@ -0,0 +1,10 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install
+}
+post_remove() {
+ post_install
+}
Deleted: community-testing-x86_64/PKGBUILD
===================================================================
--- community-testing-x86_64/PKGBUILD 2014-04-12 19:16:05 UTC (rev 109280)
+++ community-testing-x86_64/PKGBUILD 2014-04-12 19:17:21 UTC (rev 109281)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Contributor: Adam Hani Schakaki <adam at schakaki.net>
-# Contributor: Ner0
-
-pkgname=muffin
-pkgver=2.0.5
-pkgrel=3
-pkgdesc="Cinnamon window manager based on Mutter"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxmint/muffin"
-license=('GPL')
-depends=('clutter' 'gobject-introspection' 'cinnamon-desktop' 'libcanberra'
- 'startup-notification' 'zenity' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
-options=('!emptydirs')
-install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
- cogl_ABI.patch
- gtkdoc.patch)
-sha256sums=('81a57d452ea88ea926b284248033f021960400b3b9d13f5a334a77cf3bd4c7ee'
- 'bce6cf03f7d635345db8a664084b98122aa23802867c7e6e4573273ffccc01e5'
- '4f7deff60dc65557aefb9f0473bcc58a7c33c0d25ed6ebfcdd6602f7e1639caa')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- # Port to cogl 1.18
- patch -Np1 -i ../cogl_ABI.patch
-
- # Build fix
- patch -Np1 -i ../gtkdoc.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}
-
- PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
- --localstatedir=/var --disable-static --disable-schemas-compile \
- --enable-compile-warnings=minimum
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: muffin/repos/community-testing-x86_64/PKGBUILD (from rev 109280, muffin/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2014-04-12 19:17:21 UTC (rev 109281)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Contributor: Adam Hani Schakaki <adam at schakaki.net>
+# Contributor: Ner0
+
+pkgname=muffin
+pkgver=2.2.0
+pkgrel=1
+pkgdesc="Cinnamon window manager based on Mutter"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxmint/muffin"
+license=('GPL')
+depends=('clutter' 'gobject-introspection' 'cinnamon-desktop' 'libcanberra'
+ 'startup-notification' 'zenity' 'dconf')
+makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
+options=('!emptydirs')
+install=$pkgname.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz"
+ cogl_ABI.patch)
+sha256sums=('85332899ff4f441624b145af6ee9689dbab1d4b824517a35d01cc563bede9737'
+ 'bce6cf03f7d635345db8a664084b98122aa23802867c7e6e4573273ffccc01e5')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # Port to cogl 1.18
+ patch -Np1 -i ../cogl_ABI.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \
+ --localstatedir=/var --disable-static --disable-schemas-compile \
+ --enable-compile-warnings=minimum
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-testing-x86_64/cogl_ABI.patch
===================================================================
--- community-testing-x86_64/cogl_ABI.patch 2014-04-12 19:16:05 UTC (rev 109280)
+++ community-testing-x86_64/cogl_ABI.patch 2014-04-12 19:17:21 UTC (rev 109281)
@@ -1,86 +0,0 @@
-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
---- a/src/compositor/meta-shaped-texture.c
-+++ b/src/compositor/meta-shaped-texture.c
-@@ -295,10 +295,7 @@ meta_shaped_texture_ensure_mask (MetaSha
- if (meta_texture_rectangle_check (paint_tex))
- priv->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 */);
-+ stride, mask_data);
- else
- priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
- COGL_TEXTURE_NONE,
---
-cgit v0.9.2
Copied: muffin/repos/community-testing-x86_64/cogl_ABI.patch (from rev 109280, muffin/trunk/cogl_ABI.patch)
===================================================================
--- community-testing-x86_64/cogl_ABI.patch (rev 0)
+++ community-testing-x86_64/cogl_ABI.patch 2014-04-12 19:17:21 UTC (rev 109281)
@@ -0,0 +1,86 @@
+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
+--- a/src/compositor/meta-shaped-texture.c
++++ b/src/compositor/meta-shaped-texture.c
+@@ -295,10 +295,7 @@ meta_shaped_texture_ensure_mask (MetaSha
+ if (meta_texture_rectangle_check (paint_tex))
+ priv->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 */);
++ stride, mask_data);
+ else
+ priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
+ COGL_TEXTURE_NONE,
+--
+cgit v0.9.2
Deleted: community-testing-x86_64/gtkdoc.patch
===================================================================
--- community-testing-x86_64/gtkdoc.patch 2014-04-12 19:16:05 UTC (rev 109280)
+++ community-testing-x86_64/gtkdoc.patch 2014-04-12 19:17:21 UTC (rev 109281)
@@ -1,41 +0,0 @@
---- a/src/meta/prefs.h
-+++ b/src/meta/prefs.h
-@@ -310,13 +310,13 @@ typedef struct
- */
- GSList *bindings;
-
-- /** for keybindings that can have shift or not like Alt+Tab */
-+ /* for keybindings that can have shift or not like Alt+Tab */
- gboolean add_shift:1;
-
-- /** for keybindings that apply only to a window */
-+ /* for keybindings that apply only to a window */
- gboolean per_window:1;
-
-- /** for keybindings not added with meta_display_add_keybinding() */
-+ /* for keybindings not added with meta_display_add_keybinding() */
- gboolean builtin:1;
- } MetaKeyPref;
-
-@@ -339,5 +339,3 @@ CDesktopVisualBellType meta_prefs_get_vi
- MetaPlacementMode meta_prefs_get_placement_mode (void);
-
- #endif
--
--
---- a/src/core/workspace.c
-+++ b/src/core/workspace.c
-@@ -194,7 +194,7 @@ meta_workspace_new (MetaScreen *screen)
- return workspace;
- }
-
--/** Foreach function for workspace_free_struts() */
-+/* Foreach function for workspace_free_struts() */
- static void
- free_this (gpointer candidate, gpointer dummy)
- {
-@@ -1390,4 +1390,3 @@ meta_workspace_get_screen (MetaWorkspace
- {
- return workspace->screen;
- }
--
Deleted: community-testing-x86_64/muffin.install
===================================================================
--- community-testing-x86_64/muffin.install 2014-04-12 19:16:05 UTC (rev 109280)
+++ community-testing-x86_64/muffin.install 2014-04-12 19:17:21 UTC (rev 109281)
@@ -1,10 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-post_remove() {
- post_install
-}
Copied: muffin/repos/community-testing-x86_64/muffin.install (from rev 109280, muffin/trunk/muffin.install)
===================================================================
--- community-testing-x86_64/muffin.install (rev 0)
+++ community-testing-x86_64/muffin.install 2014-04-12 19:17:21 UTC (rev 109281)
@@ -0,0 +1,10 @@
+post_install() {
+ glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install
+}
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list