summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/clutter/clutter
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter')
-rw-r--r--meta/recipes-graphics/clutter/clutter/build-fix.patch16
-rw-r--r--meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch40
-rw-r--r--meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch50
-rw-r--r--meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch32
-rw-r--r--meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch32
-rw-r--r--meta/recipes-graphics/clutter/clutter/enable_tests.patch32
-rw-r--r--meta/recipes-graphics/clutter/clutter/symconflict.patch31
7 files changed, 233 insertions, 0 deletions
diff --git a/meta/recipes-graphics/clutter/clutter/build-fix.patch b/meta/recipes-graphics/clutter/clutter/build-fix.patch
new file mode 100644
index 0000000000..68cf84ec22
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter/build-fix.patch
@@ -0,0 +1,16 @@
1Installing the same file twice causes an error in Automake 1.11
2
3JL 19/03/10
4
5Index: git/clutter/Makefile.am
6===================================================================
7--- git.orig/clutter/Makefile.am 2010-03-19 11:37:51.000000000 +0000
8+++ git/clutter/Makefile.am 2010-03-19 11:50:46.744042007 +0000
9@@ -219,7 +219,6 @@
10 $(source_h) \
11 clutter-json.h \
12 clutter-enum-types.h \
13- clutter-version.h \
14 clutter.h
15
16 DISTCLEANFILES = \
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
new file mode 100644
index 0000000000..544a7e588c
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
@@ -0,0 +1,40 @@
1---
2 tests/Makefile.am | 7 ++++++-
3 tests/test-actors.c | 2 +-
4 tests/test-text.c | 2 +-
5 3 files changed, 8 insertions(+), 3 deletions(-)
6
7Index: clutter-0-6/tests/Makefile.am
8===================================================================
9--- clutter.orig/tests/Makefile.am 2007-11-06 12:29:17.000000000 +0000
10+++ clutter-0-6/tests/Makefile.am 2007-11-06 12:30:11.000000000 +0000
11@@ -1,4 +1,4 @@
12-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
13+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
14 test-actors test-behave test-text test-entry test-project \
15 test-boxes test-perspective test-rotate test-depth \
16 test-threads test-timeline test-score test-script
17@@ -26,4 +26,9 @@ test_timeline_SOURCES = test-timeline.c
18 test_score_SOURCES = test-score.c
19 test_script_SOURCES = test-script.c
20
21+test_textdir = $(pkgdatadir)
22+test_text_DATA = test-text.c
23+test_actorsdir = $(pkgdatadir)
24+test_actors_DATA = redhand.png
25+
26 EXTRA_DIST = redhand.png test-script.json
27Index: clutter-0-6/tests/test-actors.c
28===================================================================
29--- clutter.orig/tests/test-actors.c 2007-11-06 12:29:17.000000000 +0000
30+++ clutter-0-6/tests/test-actors.c 2007-11-06 12:29:21.000000000 +0000
31@@ -143,7 +143,7 @@ main (int argc, char *argv[])
32 stage = clutter_stage_get_default ();
33 clutter_actor_set_size (stage, 800, 600);
34
35- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL);
36+ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL);
37
38 if (!pixbuf)
39 g_error("pixbuf load failed");
40
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch
new file mode 100644
index 0000000000..4f449b1177
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch
@@ -0,0 +1,50 @@
1---
2 tests/Makefile.am | 7 ++++++-
3 tests/test-actors.c | 2 +-
4 tests/test-text.c | 2 +-
5 3 files changed, 8 insertions(+), 3 deletions(-)
6
7Index: clutter/tests/Makefile.am
8===================================================================
9--- clutter.orig/tests/Makefile.am 2008-06-26 16:46:26.000000000 +0100
10+++ clutter/tests/Makefile.am 2008-06-26 16:46:50.000000000 +0100
11@@ -1,4 +1,4 @@
12-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
13+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
14 test-actors test-behave test-text test-entry test-project \
15 test-perspective test-rotate test-depth \
16 test-threads test-timeline test-timeline-dup-frames \
17@@ -17,8 +17,8 @@
18 test-invariants
19
20 if X11_TESTS
21-noinst_PROGRAMS += test-pixmap
22-noinst_PROGRAMS += test-devices
23+bin_PROGRAMS += test-pixmap
24+bin_PROGRAMS += test-devices
25 endif
26
27 INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter
28@@ -73,4 +73,9 @@
29 test_invariants_SOURCES = test-invariants.c
30 test_devices_SOURCES = test-devices.c
31
32+test_textdir = $(pkgdatadir)
33+test_text_DATA = test-text.c
34+test_actorsdir = $(pkgdatadir)
35+test_actors_DATA = redhand.png
36+
37 EXTRA_DIST = redhand.png test-script.json
38Index: clutter/tests/test-actors.c
39===================================================================
40--- clutter.orig/tests/test-actors.c 2008-06-26 16:46:26.000000000 +0100
41+++ clutter/tests/test-actors.c 2008-06-26 16:46:31.000000000 +0100
42@@ -195,7 +195,7 @@
43 /* Create a texture from file, then clone in to same resources */
44 if (i == 0)
45 {
46- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png",
47+ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png",
48 &error)) == NULL)
49 {
50 g_error ("image load failed: %s", error->message);
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
new file mode 100644
index 0000000000..953edf6bbc
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
@@ -0,0 +1,32 @@
1---
2 tests/Makefile.am | 7 ++++++-
3 tests/test-actors.c | 2 +-
4 tests/test-text.c | 2 +-
5 3 files changed, 8 insertions(+), 3 deletions(-)
6
7Index: git/tests/interactive/Makefile.am
8===================================================================
9--- git.orig/tests/interactive/Makefile.am 2009-03-12 11:01:36.000000000 +0000
10+++ git/tests/interactive/Makefile.am 2009-03-12 11:04:12.000000000 +0000
11@@ -77,7 +77,7 @@
12 AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
13 AM_LDFLAGS = $(CLUTTER_LIBS)
14
15-noinst_PROGRAMS = test-interactive
16+bin_PROGRAMS = test-interactive
17
18 test_interactive_SOURCES = \
19 test-main.c \
20Index: git/tests/interactive/test-actors.c
21===================================================================
22--- git.orig/tests/interactive/test-actors.c 2009-03-12 11:01:36.000000000 +0000
23+++ git/tests/interactive/test-actors.c 2009-03-12 11:06:32.000000000 +0000
24@@ -182,7 +182,7 @@
25 oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
26 oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
27
28- real_hand = clutter_texture_new_from_file ("redhand.png", &error);
29+ real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error);
30 if (real_hand == NULL)
31 {
32 g_error ("image load failed: %s", error->message);
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
new file mode 100644
index 0000000000..953edf6bbc
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
@@ -0,0 +1,32 @@
1---
2 tests/Makefile.am | 7 ++++++-
3 tests/test-actors.c | 2 +-
4 tests/test-text.c | 2 +-
5 3 files changed, 8 insertions(+), 3 deletions(-)
6
7Index: git/tests/interactive/Makefile.am
8===================================================================
9--- git.orig/tests/interactive/Makefile.am 2009-03-12 11:01:36.000000000 +0000
10+++ git/tests/interactive/Makefile.am 2009-03-12 11:04:12.000000000 +0000
11@@ -77,7 +77,7 @@
12 AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
13 AM_LDFLAGS = $(CLUTTER_LIBS)
14
15-noinst_PROGRAMS = test-interactive
16+bin_PROGRAMS = test-interactive
17
18 test_interactive_SOURCES = \
19 test-main.c \
20Index: git/tests/interactive/test-actors.c
21===================================================================
22--- git.orig/tests/interactive/test-actors.c 2009-03-12 11:01:36.000000000 +0000
23+++ git/tests/interactive/test-actors.c 2009-03-12 11:06:32.000000000 +0000
24@@ -182,7 +182,7 @@
25 oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
26 oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
27
28- real_hand = clutter_texture_new_from_file ("redhand.png", &error);
29+ real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error);
30 if (real_hand == NULL)
31 {
32 g_error ("image load failed: %s", error->message);
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests.patch b/meta/recipes-graphics/clutter/clutter/enable_tests.patch
new file mode 100644
index 0000000000..f4af7c94f6
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests.patch
@@ -0,0 +1,32 @@
1---
2 tests/Makefile.am | 7 ++++++-
3 tests/test-actors.c | 2 +-
4 tests/test-text.c | 2 +-
5 3 files changed, 8 insertions(+), 3 deletions(-)
6
7Index: git/tests/interactive/Makefile.am
8===================================================================
9--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000
10+++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000
11@@ -88,7 +88,7 @@
12
13 common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
14
15-noinst_PROGRAMS = test-interactive
16+bin_PROGRAMS = test-interactive
17
18 test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
19 test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
20Index: git/tests/interactive/test-actors.c
21===================================================================
22--- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000
23+++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000
24@@ -178,7 +178,7 @@
25 oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
26 oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
27
28- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
29+ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL);
30 real_hand = clutter_texture_new_from_file (file, &error);
31 if (real_hand == NULL)
32 g_error ("image load failed: %s", error->message);
diff --git a/meta/recipes-graphics/clutter/clutter/symconflict.patch b/meta/recipes-graphics/clutter/clutter/symconflict.patch
new file mode 100644
index 0000000000..7685c21161
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter/symconflict.patch
@@ -0,0 +1,31 @@
1Index: git/tests/test-depth.c
2===================================================================
3--- git.orig/tests/test-depth.c 2009-05-24 14:54:40.000000000 +0100
4+++ git/tests/test-depth.c 2009-05-24 14:55:13.000000000 +0100
5@@ -11,13 +11,13 @@
6 clutter_timeline_start (timeline);
7 }
8
9-static ClutterActor *raise[2];
10+static ClutterActor *clutterraise[2];
11 static gboolean raise_no = 0;
12
13 static gboolean
14 raise_top (gpointer ignored)
15 {
16- clutter_actor_raise_top (raise[raise_no]);
17+ clutter_actor_raise_top (clutterraise[raise_no]);
18 raise_no = !raise_no;
19 return TRUE;
20 }
21@@ -202,8 +202,8 @@
22
23 clutter_timeline_start (timeline);
24
25- raise[0] = rect;
26- raise[1] = hand;
27+ clutterraise[0] = rect;
28+ clutterraise[1] = hand;
29 g_timeout_add (2000, raise_top, NULL);
30
31 clutter_main ();
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-08 14:42:12 +0000