summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-01-28 10:01:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-01 23:59:39 +0000
commit3bb0b9ae97f89507b742cd9b3e03f37c2d928270 (patch)
tree024f846b86bce7074173390ab9b81e0c0a11d612
parentba06cc8943d021f406c3d292ce415b77319ca5c6 (diff)
downloadpoky-3bb0b9ae97f89507b742cd9b3e03f37c2d928270.tar.gz
clutter-1.0: Upgrade to 1.4 - latest stable version
* Use tar ball release rather than git, as it is more stable. Added dependence on gettext, and one patch to fix the cross-compile failure due to conformance-test. * configure "--with-json=check" avoid extra dependence on external json lib. * rename examples package (clutter-examples-1.x => clutter-1.x-example) to lead the right deploy package name Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0_git.bb21
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb25
-rw-r--r--meta/recipes-graphics/clutter/clutter-box2d.inc2
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb2
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst.inc2
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb2
-rw-r--r--meta/recipes-graphics/clutter/clutter.inc2
-rw-r--r--meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch13
-rw-r--r--meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch66
-rw-r--r--meta/recipes-graphics/clutter/tidy.inc2
-rw-r--r--meta/recipes-graphics/mutter/mutter.inc2
-rw-r--r--meta/recipes-graphics/tasks/task-poky-clutter.bb2
12 files changed, 112 insertions, 29 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_git.bb b/meta/recipes-graphics/clutter/clutter-1.0_git.bb
deleted file mode 100644
index ec50f076ba..0000000000
--- a/meta/recipes-graphics/clutter/clutter-1.0_git.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1require clutter.inc
2
3PV = "1.0+git${SRCPV}"
4PR = "r3"
5
6PACKAGES =+ "clutter-examples-1.0"
7FILES_clutter-examples-1.0 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
8
9SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-1.0 \
10 file://enable_tests-1.0.patch;patch=1 "
11
12LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
13S = "${WORKDIR}/git"
14
15BASE_CONF += "--disable-introspection"
16
17
18do_configure_prepend () {
19 # Disable DOLT
20 sed -i -e 's/^DOLT//' ${S}/configure.ac
21}
diff --git a/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb
new file mode 100644
index 0000000000..998545ab21
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb
@@ -0,0 +1,25 @@
1require clutter.inc
2
3PR = "r0"
4
5PACKAGES =+ "${PN}-examples"
6FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
7
8SRC_URI = "http://source.clutter-project.org/sources/clutter/1.4/clutter-${PV}.tar.bz2 \
9 file://enable_tests-1.4.patch;patch=1 \
10 file://test-conformance-fix.patch;patch=1 "
11
12LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
13S = "${WORKDIR}/clutter-1.4.2"
14
15BASE_CONF += "--disable-introspection"
16
17EXTRA_OECONF += "--with-json=check"
18
19do_configure_prepend () {
20 # Disable DOLT
21 sed -i -e 's/^DOLT//' ${S}/configure.ac
22}
23
24SRC_URI[md5sum] = "5a3c6d8414d4e286aba0a936f344c9b1"
25SRC_URI[sha256sum] = "92fd67acce5105c933e54ad0c87d0f5ace1202fd0f87949cb49a3759e6e38892"
diff --git a/meta/recipes-graphics/clutter/clutter-box2d.inc b/meta/recipes-graphics/clutter/clutter-box2d.inc
index 7de824495b..0249984b17 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d.inc
+++ b/meta/recipes-graphics/clutter/clutter-box2d.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter Box2D"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "Catto" 3LICENSE = "Catto"
4 4
5DEPENDS = "clutter-1.0" 5DEPENDS = "clutter-1.4"
6 6
7# The main clutter lib is machine specific so we need to be too 7# The main clutter lib is machine specific so we need to be too
8PACKAGE_ARCH = "${MACHINE_ARCH}" 8PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb b/meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb
index 46519a019d..47eb800c7c 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.0_git.bb
@@ -5,7 +5,7 @@ PV = "0.11.0+git${SRCPV}"
5LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
6 file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" 6 file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
7 7
8DEPENDS += "clutter-1.0" 8DEPENDS += "clutter-1.4"
9 9
10SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master" 10SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master"
11 11
diff --git a/meta/recipes-graphics/clutter/clutter-gst.inc b/meta/recipes-graphics/clutter/clutter-gst.inc
index c46d0f0ae8..104ba56e33 100644
--- a/meta/recipes-graphics/clutter/clutter-gst.inc
+++ b/meta/recipes-graphics/clutter/clutter-gst.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter GStreamer"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2+" 3LICENSE = "LGPLv2+"
4 4
5DEPENDS = "clutter-1.0 gstreamer gst-plugins-base" 5DEPENDS = "clutter-1.4 gstreamer gst-plugins-base"
6 6
7FILESPATH = "${FILE_DIRNAME}/clutter-gst" 7FILESPATH = "${FILE_DIRNAME}/clutter-gst"
8 8
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb
index 47667d0eed..ddb7d5aaaf 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_git.bb
@@ -10,6 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12
13DEPENDS += "gtk+ clutter-1.0" 13DEPENDS += "gtk+ clutter-1.4"
14 14
15EXTRA_OECONF += "--disable-introspection" 15EXTRA_OECONF += "--disable-introspection"
diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
index a42a6c59d6..bdfcb9169b 100644
--- a/meta/recipes-graphics/clutter/clutter.inc
+++ b/meta/recipes-graphics/clutter/clutter.inc
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qe
7STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi" 7STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi"
8BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" 8BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
9 9
10DEPENDS = "${STDDEPENDS} virtual/libgl" 10DEPENDS = "${STDDEPENDS} virtual/libgl gettext"
11EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" 11EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
12 12
13DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib" 13DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib"
diff --git a/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch b/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
new file mode 100644
index 0000000000..52fdcb4c1f
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
@@ -0,0 +1,13 @@
1Index: git/tests/interactive/Makefile.am
2===================================================================
3--- git.orig/tests/interactive/Makefile.am 2011-01-28 14:06:29.000000000 +0800
4+++ git/tests/interactive/Makefile.am 2011-01-28 14:26:59.000000000 +0800
5@@ -107,7 +107,7 @@
6
7 common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_SONAME_INFIX@-@CLUTTER_API_VERSION@.la
8
9-noinst_PROGRAMS = test-interactive
10+bin_PROGRAMS = test-interactive
11
12 test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
13 test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
diff --git a/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch b/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
new file mode 100644
index 0000000000..ce412ff5af
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
@@ -0,0 +1,66 @@
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
33diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
34index 3036639..1e723e7 100644
35--- a/tests/conform/Makefile.am
36+++ b/tests/conform/Makefile.am
37@@ -89,9 +89,11 @@ test_conformance_SOURCES = $(common_sources) $(units_sources)
38
39 wrappers: stamp-test-conformance
40 @true
41-stamp-test-conformance: Makefile test-conformance$(EXEEXT)
42+stamp-test-conformance: Makefile $(srcdir)/test-conform-main.c
43 @mkdir -p wrappers
44- @( $(abs_builddir)/test-conformance$(EXEEXT) -l -m thorough | $(GREP) '^/' ) > unit-tests
45+ @sed -n -e 's/^ \{1,\}TEST_CONFORM_SIMPLE *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \
46+ -e 's/^ \{1,\}TEST_CONFORM_SKIP *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \
47+ $(srcdir)/test-conform-main.c > unit-tests
48 @chmod +x test-launcher.sh
49 @( echo "/stamp-test-conformance" ; \
50 echo "/test-conformance" ; \
51diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
52index a8b3cf8..2ae7a04 100644
53--- a/tests/conform/test-conform-main.c
54+++ b/tests/conform/test-conform-main.c
55@@ -92,6 +92,11 @@ main (int argc, char **argv)
56 {
57 clutter_test_init (&argc, &argv);
58
59+ /* This file is run through a sed script during the make step so the
60+ lines containing the tests need to be formatted on a single line
61+ each. To comment out a test use the SKIP or TODO macros. Using
62+ #if 0 would break the script. */
63+
64 TEST_CONFORM_SIMPLE ("/timeline", test_timeline);
65 TEST_CONFORM_SKIP (!g_test_slow (), "/timeline", test_timeline_interpolate);
66 TEST_CONFORM_SKIP (!g_test_slow (), "/timeline", test_timeline_rewind);
diff --git a/meta/recipes-graphics/clutter/tidy.inc b/meta/recipes-graphics/clutter/tidy.inc
index 19685918dc..13d6fc7686 100644
--- a/meta/recipes-graphics/clutter/tidy.inc
+++ b/meta/recipes-graphics/clutter/tidy.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Tidy library"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2.1+" 3LICENSE = "LGPLv2.1+"
4 4
5STDDEPENDS = "clutter-1.0" 5STDDEPENDS = "clutter-1.4"
6BASE_CONF = "--disable-gtk-doc" 6BASE_CONF = "--disable-gtk-doc"
7 7
8DEPENDS = "${STDDEPENDS}" 8DEPENDS = "${STDDEPENDS}"
diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc
index cf42e42f4d..a734cdda46 100644
--- a/meta/recipes-graphics/mutter/mutter.inc
+++ b/meta/recipes-graphics/mutter/mutter.inc
@@ -1,7 +1,7 @@
1SECTION = "x11/wm" 1SECTION = "x11/wm"
2DESCRIPTION = "Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter." 2DESCRIPTION = "Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter."
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4DEPENDS = "startup-notification gtk+ gconf clutter-1.0 gdk-pixbuf-native intltool glib-2.0-native" 4DEPENDS = "startup-notification gtk+ gconf clutter-1.4 gdk-pixbuf-native intltool glib-2.0-native"
5# gobject-introspection 5# gobject-introspection
6inherit gnome update-alternatives 6inherit gnome update-alternatives
7 7
diff --git a/meta/recipes-graphics/tasks/task-poky-clutter.bb b/meta/recipes-graphics/tasks/task-poky-clutter.bb
index e7e6364110..f740d74c54 100644
--- a/meta/recipes-graphics/tasks/task-poky-clutter.bb
+++ b/meta/recipes-graphics/tasks/task-poky-clutter.bb
@@ -24,7 +24,7 @@ PACKAGES = "\
24ALLOW_EMPTY = "1" 24ALLOW_EMPTY = "1"
25 25
26RDEPENDS_task-poky-clutter-core = "\ 26RDEPENDS_task-poky-clutter-core = "\
27 clutter-1.0 \ 27 clutter-1.4 \
28 clutter-gst-1.0 \ 28 clutter-gst-1.0 \
29 clutter-gtk-1.0" 29 clutter-gtk-1.0"
30 30