clutter: New package.

diff --git a/clutter/clutter.nm b/clutter/clutter.nm
new file mode 100644 (file)
index 0000000..b6d7f77
--- /dev/null
+++ b/clutter/clutter.nm
@@ -0,0 +1,68 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
+###############################################################################
+
+name       = clutter
+version    = %{ver_maj}.%{ver_min}
+ver_maj    = 1.13
+ver_min    = 4
+release    = 1
+
+groups     = Development/Libraries
+url        = http://www.clutter-project.org/
+license    = LGPLv2+
+summary    = Open Source software library for creating rich graphical user \
+       interfaces.
+
+description
+       Clutter is an open source software library for creating fast,
+       visually rich graphical user interfaces. The most obvious example
+       of potential usage is in media center type applications.
+       We hope however it can be used for a lot more.
+end
+
+source_dl  = http://download.gnome.org/sources/clutter/%{ver_maj}/
+sources    = %{thisapp}.tar.xz
+
+build
+       requires
+               atk-devel
+               cairo-gobject-devel
+               gdk-pixbuf2-devel
+               glib2-devel
+               gobject-introspection-devel >= 0.9.6
+               cogl-devel
+               gtk3-devel
+               json-glib-devel
+               libXcomposite-devel
+               libXdamage-devel
+               libXi-devel
+               libGL-devel
+               pango-devel
+       end
+
+       configure_options += \
+               --enable-xinput
+
+       make_build_targets += V=1
+end
+
+packages
+       package %{name}
+               requires
+                       libGL
+               end
+       end
+
+       package %{name}-devel
+               template DEVEL
+
+               files += \
+                       %{datadir}/gir*/
+       end
+
+       package %{name}-debuginfo
+               template DEBUGINFO
+       end
+end

diff --git a/clutter/patches/clutter-1.13.4-xi23.patch b/clutter/patches/clutter-1.13.4-xi23.patch
new file mode 100644 (file)
index 0000000..b11c80c
--- /dev/null
+++ b/clutter/patches/clutter-1.13.4-xi23.patch
@@ -0,0 +1,65 @@
+From b58a1d66816c19eda079a1bd7cecd1ad03644e69 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre@mecheye.net>
+Date: Wed, 23 Jan 2013 17:09:59 -0500
+Subject: [PATCH] x11: Always request XI2.2
+
+The X server should fill in the minor version that it supports in the
+case where it only supports the older version. We should not get a
+BadRequest or fail the version check if we pass something higher.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=692466
+---
+ clutter/x11/clutter-backend-x11.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
+index 2d8f4ba..26f9581 100644
+--- a/clutter/x11/clutter-backend-x11.c
++++ b/clutter/x11/clutter-backend-x11.c
+@@ -239,12 +239,7 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
+             {
+ #ifdef HAVE_XINPUT_2
+               int major = 2;
+-
+-#ifdef HAVE_XINPUT_2_2
+               int minor = 2;
+-#else
+-              int minor = 0;
+-#endif /* HAVE_XINPUT_2_2 */
+ 
+               if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest)
+                 {
+-- 
+1.8.1.2
+
+From 3e1450ba17fce90a8034cc525c67a87ff3cdd53d Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre@mecheye.net>
+Date: Wed, 23 Jan 2013 14:49:26 -0500
+Subject: [PATCH] clutter-backend: Request XI2.3
+
+Since XIQueryVersion, the bad API that it is, chooses the first client
+version that it gets, we need to ensure that we pass XIQueryVersion the
+new XI2.3 version, knowing fully well that Clutter won't be confused
+by the new features.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=692466
+---
+ clutter/x11/clutter-backend-x11.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
+index 26f9581..1015f4c 100644
+--- a/clutter/x11/clutter-backend-x11.c
++++ b/clutter/x11/clutter-backend-x11.c
+@@ -239,7 +239,7 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11)
+             {
+ #ifdef HAVE_XINPUT_2
+               int major = 2;
+-              int minor = 2;
++              int minor = 3;
+ 
+               if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest)
+                 {
+-- 
+1.8.1.2
+

diff --git a/clutter/patches/oob-device-fix.patch b/clutter/patches/oob-device-fix.patch
new file mode 100644 (file)
index 0000000..cc59282
--- /dev/null
+++ b/clutter/patches/oob-device-fix.patch
@@ -0,0 +1,33 @@
+From d5604be9e5a148ced73dee2ede49b38f97119baf Mon Sep 17 00:00:00 2001
+From: Yanko Kaneti <yaneti@declera.com>
+Date: Mon, 28 Jan 2013 15:49:51 +0200
+Subject: [PATCH] xi2: Fix access beyond array boundaries
+
+---
+ clutter/x11/clutter-device-manager-xi2.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
+index 616dee7..bd9473e 100644
+--- a/clutter/x11/clutter-device-manager-xi2.c
++++ b/clutter/x11/clutter-device-manager-xi2.c
+@@ -94,13 +94,13 @@ translate_valuator_class (Display             *xdisplay,
+       atoms_initialized = TRUE;
+     }
+ 
+-  for (i = CLUTTER_INPUT_AXIS_IGNORE;
+-       i < CLUTTER_INPUT_AXIS_LAST;
++  for (i = 0;
++       i < N_AXIS_ATOMS;
+        i += 1)
+     {
+       if (clutter_input_axis_atoms[i] == class->label)
+         {
+-          axis = i;
++          axis = i + 1;
+           break;
+         }
+     }
+-- 
+1.8.1
+