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.patch18
-rw-r--r--meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch42
-rw-r--r--meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch52
-rw-r--r--meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch34
-rw-r--r--meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch15
-rw-r--r--meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch34
-rw-r--r--meta/recipes-graphics/clutter/clutter/enable_tests.patch34
-rw-r--r--meta/recipes-graphics/clutter/clutter/symconflict.patch33
-rw-r--r--meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch68
-rw-r--r--meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch32
10 files changed, 0 insertions, 362 deletions
diff --git a/meta/recipes-graphics/clutter/clutter/build-fix.patch b/meta/recipes-graphics/clutter/clutter/build-fix.patch
deleted file mode 100644
index 08c1845dfa..0000000000
--- a/meta/recipes-graphics/clutter/clutter/build-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1Installing the same file twice causes an error in Automake 1.11
2
3JL 19/03/10
4
5Upstream-Status: Pending
6
7Index: git/clutter/Makefile.am
8===================================================================
9--- git.orig/clutter/Makefile.am 2010-03-19 11:37:51.000000000 +0000
10+++ git/clutter/Makefile.am 2010-03-19 11:50:46.744042007 +0000
11@@ -219,7 +219,6 @@
12 $(source_h) \
13 clutter-json.h \
14 clutter-enum-types.h \
15- clutter-version.h \
16 clutter.h
17
18 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
deleted file mode 100644
index 8cff0c5fe5..0000000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch
+++ /dev/null
@@ -1,42 +0,0 @@
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
7Upstream-Status: Inappropriate [configuration]
8
9Index: clutter-0-6/tests/Makefile.am
10===================================================================
11--- clutter.orig/tests/Makefile.am 2007-11-06 12:29:17.000000000 +0000
12+++ clutter-0-6/tests/Makefile.am 2007-11-06 12:30:11.000000000 +0000
13@@ -1,4 +1,4 @@
14-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
15+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
16 test-actors test-behave test-text test-entry test-project \
17 test-boxes test-perspective test-rotate test-depth \
18 test-threads test-timeline test-score test-script
19@@ -26,4 +26,9 @@ test_timeline_SOURCES = test-timeline.c
20 test_score_SOURCES = test-score.c
21 test_script_SOURCES = test-script.c
22
23+test_textdir = $(pkgdatadir)
24+test_text_DATA = test-text.c
25+test_actorsdir = $(pkgdatadir)
26+test_actors_DATA = redhand.png
27+
28 EXTRA_DIST = redhand.png test-script.json
29Index: clutter-0-6/tests/test-actors.c
30===================================================================
31--- clutter.orig/tests/test-actors.c 2007-11-06 12:29:17.000000000 +0000
32+++ clutter-0-6/tests/test-actors.c 2007-11-06 12:29:21.000000000 +0000
33@@ -143,7 +143,7 @@ main (int argc, char *argv[])
34 stage = clutter_stage_get_default ();
35 clutter_actor_set_size (stage, 800, 600);
36
37- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL);
38+ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL);
39
40 if (!pixbuf)
41 g_error("pixbuf load failed");
42
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch
deleted file mode 100644
index d3c196fd83..0000000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch
+++ /dev/null
@@ -1,52 +0,0 @@
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
7Upstream-Status: Inappropriate [configuration]
8
9Index: clutter/tests/Makefile.am
10===================================================================
11--- clutter.orig/tests/Makefile.am 2008-06-26 16:46:26.000000000 +0100
12+++ clutter/tests/Makefile.am 2008-06-26 16:46:50.000000000 +0100
13@@ -1,4 +1,4 @@
14-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
15+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \
16 test-actors test-behave test-text test-entry test-project \
17 test-perspective test-rotate test-depth \
18 test-threads test-timeline test-timeline-dup-frames \
19@@ -17,8 +17,8 @@
20 test-invariants
21
22 if X11_TESTS
23-noinst_PROGRAMS += test-pixmap
24-noinst_PROGRAMS += test-devices
25+bin_PROGRAMS += test-pixmap
26+bin_PROGRAMS += test-devices
27 endif
28
29 INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter
30@@ -73,4 +73,9 @@
31 test_invariants_SOURCES = test-invariants.c
32 test_devices_SOURCES = test-devices.c
33
34+test_textdir = $(pkgdatadir)
35+test_text_DATA = test-text.c
36+test_actorsdir = $(pkgdatadir)
37+test_actors_DATA = redhand.png
38+
39 EXTRA_DIST = redhand.png test-script.json
40Index: clutter/tests/test-actors.c
41===================================================================
42--- clutter.orig/tests/test-actors.c 2008-06-26 16:46:26.000000000 +0100
43+++ clutter/tests/test-actors.c 2008-06-26 16:46:31.000000000 +0100
44@@ -195,7 +195,7 @@
45 /* Create a texture from file, then clone in to same resources */
46 if (i == 0)
47 {
48- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png",
49+ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png",
50 &error)) == NULL)
51 {
52 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
deleted file mode 100644
index 16460b1a11..0000000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
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
7Upstream-Status: Inappropriate [configuration]
8
9Index: git/tests/interactive/Makefile.am
10===================================================================
11--- git.orig/tests/interactive/Makefile.am 2009-03-12 11:01:36.000000000 +0000
12+++ git/tests/interactive/Makefile.am 2009-03-12 11:04:12.000000000 +0000
13@@ -77,7 +77,7 @@
14 AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
15 AM_LDFLAGS = $(CLUTTER_LIBS)
16
17-noinst_PROGRAMS = test-interactive
18+bin_PROGRAMS = test-interactive
19
20 test_interactive_SOURCES = \
21 test-main.c \
22Index: git/tests/interactive/test-actors.c
23===================================================================
24--- git.orig/tests/interactive/test-actors.c 2009-03-12 11:01:36.000000000 +0000
25+++ git/tests/interactive/test-actors.c 2009-03-12 11:06:32.000000000 +0000
26@@ -182,7 +182,7 @@
27 oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
28 oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
29
30- real_hand = clutter_texture_new_from_file ("redhand.png", &error);
31+ real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error);
32 if (real_hand == NULL)
33 {
34 g_error ("image load failed: %s", error->message);
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
deleted file mode 100644
index 2ff76976f4..0000000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: git/tests/interactive/Makefile.am
4===================================================================
5--- git.orig/tests/interactive/Makefile.am 2011-01-28 14:06:29.000000000 +0800
6+++ git/tests/interactive/Makefile.am 2011-01-28 14:26:59.000000000 +0800
7@@ -107,7 +107,7 @@
8
9 common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_API_VERSION@.la
10
11-noinst_PROGRAMS = test-interactive
12+bin_PROGRAMS = test-interactive
13
14 test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
15 test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
deleted file mode 100644
index 16460b1a11..0000000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch
+++ /dev/null
@@ -1,34 +0,0 @@
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
7Upstream-Status: Inappropriate [configuration]
8
9Index: git/tests/interactive/Makefile.am
10===================================================================
11--- git.orig/tests/interactive/Makefile.am 2009-03-12 11:01:36.000000000 +0000
12+++ git/tests/interactive/Makefile.am 2009-03-12 11:04:12.000000000 +0000
13@@ -77,7 +77,7 @@
14 AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
15 AM_LDFLAGS = $(CLUTTER_LIBS)
16
17-noinst_PROGRAMS = test-interactive
18+bin_PROGRAMS = test-interactive
19
20 test_interactive_SOURCES = \
21 test-main.c \
22Index: git/tests/interactive/test-actors.c
23===================================================================
24--- git.orig/tests/interactive/test-actors.c 2009-03-12 11:01:36.000000000 +0000
25+++ git/tests/interactive/test-actors.c 2009-03-12 11:06:32.000000000 +0000
26@@ -182,7 +182,7 @@
27 oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
28 oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
29
30- real_hand = clutter_texture_new_from_file ("redhand.png", &error);
31+ real_hand = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", &error);
32 if (real_hand == NULL)
33 {
34 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
deleted file mode 100644
index 480b208cc7..0000000000
--- a/meta/recipes-graphics/clutter/clutter/enable_tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
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
7Upstream-Status: Inappropriate [configuration]
8
9Index: git/tests/interactive/Makefile.am
10===================================================================
11--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.000000000 +0000
12+++ git/tests/interactive/Makefile.am 2009-11-30 17:42:30.000000000 +0000
13@@ -88,7 +88,7 @@
14
15 common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
16
17-noinst_PROGRAMS = test-interactive
18+bin_PROGRAMS = test-interactive
19
20 test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
21 test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
22Index: git/tests/interactive/test-actors.c
23===================================================================
24--- git.orig/tests/interactive/test-actors.c 2009-11-30 17:39:46.000000000 +0000
25+++ git/tests/interactive/test-actors.c 2009-11-30 17:43:03.000000000 +0000
26@@ -178,7 +178,7 @@
27 oh->scaler_1 = clutter_behaviour_scale_new (alpha, 0.5, 0.5, 1.0, 1.0);
28 oh->scaler_2 = clutter_behaviour_scale_new (alpha, 1.0, 1.0, 0.5, 0.5);
29
30- file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
31+ file = g_build_filename (TESTS_DATADIR, "/usr/share/clutter/redhand.png", NULL);
32 real_hand = clutter_texture_new_from_file (file, &error);
33 if (real_hand == NULL)
34 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
deleted file mode 100644
index 05f3d27500..0000000000
--- a/meta/recipes-graphics/clutter/clutter/symconflict.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Upstream-Status: Pending
2
3Index: git/tests/test-depth.c
4===================================================================
5--- git.orig/tests/test-depth.c 2009-05-24 14:54:40.000000000 +0100
6+++ git/tests/test-depth.c 2009-05-24 14:55:13.000000000 +0100
7@@ -11,13 +11,13 @@
8 clutter_timeline_start (timeline);
9 }
10
11-static ClutterActor *raise[2];
12+static ClutterActor *clutterraise[2];
13 static gboolean raise_no = 0;
14
15 static gboolean
16 raise_top (gpointer ignored)
17 {
18- clutter_actor_raise_top (raise[raise_no]);
19+ clutter_actor_raise_top (clutterraise[raise_no]);
20 raise_no = !raise_no;
21 return TRUE;
22 }
23@@ -202,8 +202,8 @@
24
25 clutter_timeline_start (timeline);
26
27- raise[0] = rect;
28- raise[1] = hand;
29+ clutterraise[0] = rect;
30+ clutterraise[1] = hand;
31 g_timeout_add (2000, raise_top, NULL);
32
33 clutter_main ();
diff --git a/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch b/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
deleted file mode 100644
index ccc6c2a32d..0000000000
--- a/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1Compiling conformance test leads running test-conformance target binary, and
2gets failure in cross-compile environment. Introduce this commit from upstream
3to fix it.
4
5Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
6
7
8commit 7fd6273c25569fe4f37ad371532d93e5170e51f7
9Author: Neil Roberts <neil@linux.intel.com>
10Date: Mon Oct 11 16:16:45 2010 +0100
11
12 tests: Generate the stub scripts using sed
13
14 Instead of trying to run ./test-conformance with the -l option to
15 generate a list of available tests it now runs sed on the
16 test-conform-main.c file instead. Running the generated executable is
17 a pain for cross-compiling so it would be nice to avoid it unless it's
18 absolutely necessary. Although you could tell people who are cross
19 compiling to just disable the conformance tests, this seems a shame
20 because they could still be useful along with the wrappers for example
21 if the cross compile is built to a shared network folder where the
22 tests can be run on the actual device.
23
24 The sed script is a little more ugly than it could be because it tries
25 to avoid using the GNU extensions '\+' and '\|'.
26
27 The script ends up placing restrictions on the format of the C file
28 because the tests must all be listed on one line each. There is now a
29 comment to explain this. Hopefully the trade off is worth it.
30
31 http://bugzilla.clutter-project.org/show_bug.cgi?id=2363
32
33Upstream-Status: Backport
34
35diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
36index 3036639..1e723e7 100644
37--- a/tests/conform/Makefile.am
38+++ b/tests/conform/Makefile.am
39@@ -89,9 +89,11 @@ test_conformance_SOURCES = $(common_sources) $(units_sources)
40
41 wrappers: stamp-test-conformance
42 @true
43-stamp-test-conformance: Makefile test-conformance$(EXEEXT)
44+stamp-test-conformance: Makefile $(srcdir)/test-conform-main.c
45 @mkdir -p wrappers
46- @( $(abs_builddir)/test-conformance$(EXEEXT) -l -m thorough | $(GREP) '^/' ) > unit-tests
47+ @sed -n -e 's/^ \{1,\}TEST_CONFORM_SIMPLE *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \
48+ -e 's/^ \{1,\}TEST_CONFORM_SKIP *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \
49+ $(srcdir)/test-conform-main.c > unit-tests
50 @chmod +x test-launcher.sh
51 @( echo "/stamp-test-conformance" ; \
52 echo "/test-conformance" ; \
53diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
54index a8b3cf8..2ae7a04 100644
55--- a/tests/conform/test-conform-main.c
56+++ b/tests/conform/test-conform-main.c
57@@ -92,6 +92,11 @@ main (int argc, char **argv)
58 {
59 clutter_test_init (&argc, &argv);
60
61+ /* This file is run through a sed script during the make step so the
62+ lines containing the tests need to be formatted on a single line
63+ each. To comment out a test use the SKIP or TODO macros. Using
64+ #if 0 would break the script. */
65+
66 TEST_CONFORM_SIMPLE ("/timeline", test_timeline);
67 TEST_CONFORM_SKIP (!g_test_slow (), "/timeline", test_timeline_interpolate);
68 TEST_CONFORM_SKIP (!g_test_slow (), "/timeline", test_timeline_rewind);
diff --git a/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch b/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch
deleted file mode 100644
index 6671098902..0000000000
--- a/meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Saul Wold <sgw@linux.intel.com>
4
5Index: clutter-1.6.14/build/autotools/po.m4
6===================================================================
7--- clutter-1.6.14.orig/build/autotools/po.m4 2011-05-31 22:39:55.000000000 -0700
8+++ clutter-1.6.14/build/autotools/po.m4 2011-05-31 22:40:36.898833113 -0700
9@@ -29,7 +29,7 @@
10
11 dnl Release version of the gettext macros. This is used to ensure that
12 dnl the gettext macros and po/Makefile.in.in are in sync.
13- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
14+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
15
16 dnl Perform the following tests also if --disable-nls has been given,
17 dnl because they are needed for "make dist" to work.
18Index: clutter-1.6.14/po/Makefile.in.in
19===================================================================
20--- clutter-1.6.14.orig/po/Makefile.in.in 2011-05-31 22:40:05.000000000 -0700
21+++ clutter-1.6.14/po/Makefile.in.in 2011-05-31 22:40:21.030833109 -0700
22@@ -8,8 +8,8 @@
23 # Please note that the actual code of GNU gettext is covered by the GNU
24 # General Public License and is *not* in the public domain.
25 #
26-# Origin: gettext-0.17
27-GETTEXT_MACRO_VERSION = 0.17
28+# Origin: gettext-0.18
29+GETTEXT_MACRO_VERSION = 0.18
30
31 PACKAGE = @PACKAGE@
32 VERSION = @VERSION@
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-01 01:18:02 +0000