aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/clutter/clutter/symconflict.patch
diff options
context:
space:
mode:
authorTomas Frydrych <tomas@sleepfive.com>2013-05-20 16:05:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-21 09:14:37 +0100
commit4fbae4449fbb3f5eba499418b374c12bccfb4243 (patch)
tree8cb6ea5ceea62218fe73f0bbc39b19505f932d4f /meta/recipes-graphics/clutter/clutter/symconflict.patch
parentb508fdd2b19ca30da8d09caf646897dc4cf195c8 (diff)
downloadopenembedded-core-contrib-4fbae4449fbb3f5eba499418b374c12bccfb4243.tar.gz
clutter: Replace with 1.14.4 version
The package has been renamed to clutter-1.0 instead of clutter-vmajor.vminor, keeping up with the upstream versioning policy (all 1.x packages install clutter-1.0 pc file and headers and are backward compatible), and to simplify dependency management (worth noting that since the 1.x development files are not parall installable, it is not possible to use two versions of clutter 1.x at the same time anyway). Package configuration is provided via PACKAGECONFIG options as follows: 'x11' : enable X11 backend, 'glx' : enable GLX backend, 'egl' : enable EGL backend, 'evdev': enable evdev input backend Default configuration is 'glx'; typical configuration for embedded HW using 'native' EGL would be 'egl evdev'. Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter/symconflict.patch')
-rw-r--r--meta/recipes-graphics/clutter/clutter/symconflict.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/meta/recipes-graphics/clutter/clutter/symconflict.patch b/meta/recipes-graphics/clutter/clutter/symconflict.patch
deleted file mode 100644
index 05f3d27500..0000000000
--- a/meta/recipes-graphics/clutter/clutter/symconflict.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Pending
-
-Index: git/tests/test-depth.c
-===================================================================
---- git.orig/tests/test-depth.c 2009-05-24 14:54:40.000000000 +0100
-+++ git/tests/test-depth.c 2009-05-24 14:55:13.000000000 +0100
-@@ -11,13 +11,13 @@
- clutter_timeline_start (timeline);
- }
-
--static ClutterActor *raise[2];
-+static ClutterActor *clutterraise[2];
- static gboolean raise_no = 0;
-
- static gboolean
- raise_top (gpointer ignored)
- {
-- clutter_actor_raise_top (raise[raise_no]);
-+ clutter_actor_raise_top (clutterraise[raise_no]);
- raise_no = !raise_no;
- return TRUE;
- }
-@@ -202,8 +202,8 @@
-
- clutter_timeline_start (timeline);
-
-- raise[0] = rect;
-- raise[1] = hand;
-+ clutterraise[0] = rect;
-+ clutterraise[1] = hand;
- g_timeout_add (2000, raise_top, NULL);
-
- clutter_main ();