[poky] [PATCH 1/7] clutter-1.0: Upgrade to 1.4 - latest stable version
Mon Jan 31 18:03:25 PST 2011
From: Zhai Edwin <edwin.zhai at intel.com>
* 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 at intel.com>
---
meta/recipes-graphics/clutter/clutter-1.0_git.bb | 21 ------
meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb | 25 ++++++++
meta/recipes-graphics/clutter/clutter-box2d.inc | 2 +-
.../clutter/clutter-gst-1.0_git.bb | 2 +-
meta/recipes-graphics/clutter/clutter-gst.inc | 2 +-
.../clutter/clutter-gtk-1.0_git.bb | 2 +-
meta/recipes-graphics/clutter/clutter.inc | 2 +-
.../clutter/clutter/enable_tests-1.4.patch | 13 ++++
.../clutter/clutter/test-conformance-fix.patch | 66 ++++++++++++++++++++
meta/recipes-graphics/clutter/tidy.inc | 2 +-
meta/recipes-graphics/mutter/mutter.inc | 2 +-
meta/recipes-graphics/tasks/task-poky-clutter.bb | 2 +-
12 files changed, 112 insertions(+), 29 deletions(-)
delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0_git.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb
create mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
create mode 100644 meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
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 ec50f07..0000000
--- a/meta/recipes-graphics/clutter/clutter-1.0_git.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require clutter.inc
-
-PV = "1.0+git${SRCPV}"
-PR = "r3"
-
-PACKAGES =+ "clutter-examples-1.0"
-FILES_clutter-examples-1.0 = "${bindir}/test-* ${pkgdatadir}/redhand.png"
-
-SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-1.0 \
- file://enable_tests-1.0.patch;patch=1 "
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-S = "${WORKDIR}/git"
-
-BASE_CONF += "--disable-introspection"
-
-
-do_configure_prepend () {
- # Disable DOLT
- sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
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 0000000..998545a
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.4_1.4.2.bb
@@ -0,0 +1,25 @@
+require clutter.inc
+
+PR = "r0"
+
+PACKAGES =+ "${PN}-examples"
+FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
+
+SRC_URI = "http://source.clutter-project.org/sources/clutter/1.4/clutter-${PV}.tar.bz2 \
+ file://enable_tests-1.4.patch;patch=1 \
+ file://test-conformance-fix.patch;patch=1 "
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+S = "${WORKDIR}/clutter-1.4.2"
+
+BASE_CONF += "--disable-introspection"
+
+EXTRA_OECONF += "--with-json=check"
+
+do_configure_prepend () {
+ # Disable DOLT
+ sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
+
+SRC_URI[md5sum] = "5a3c6d8414d4e286aba0a936f344c9b1"
+SRC_URI[sha256sum] = "92fd67acce5105c933e54ad0c87d0f5ace1202fd0f87949cb49a3759e6e38892"
diff --git a/meta/recipes-graphics/clutter/clutter-box2d.inc b/meta/recipes-graphics/clutter/clutter-box2d.inc
index 7de8244..0249984 100644
--- a/meta/recipes-graphics/clutter/clutter-box2d.inc
+++ b/meta/recipes-graphics/clutter/clutter-box2d.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter Box2D"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "Catto"
-DEPENDS = "clutter-1.0"
+DEPENDS = "clutter-1.4"
# The main clutter lib is machine specific so we need to be too
PACKAGE_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 46519a0..47eb800 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}"
LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
-DEPENDS += "clutter-1.0"
+DEPENDS += "clutter-1.4"
SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master"
diff --git a/meta/recipes-graphics/clutter/clutter-gst.inc b/meta/recipes-graphics/clutter/clutter-gst.inc
index c46d0f0..104ba56 100644
--- a/meta/recipes-graphics/clutter/clutter-gst.inc
+++ b/meta/recipes-graphics/clutter/clutter-gst.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter GStreamer"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPLv2+"
-DEPENDS = "clutter-1.0 gstreamer gst-plugins-base"
+DEPENDS = "clutter-1.4 gstreamer gst-plugins-base"
FILESPATH = "${FILE_DIRNAME}/clutter-gst"
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 47667d0..ddb7d5a 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"
S = "${WORKDIR}/git"
-DEPENDS += "gtk+ clutter-1.0"
+DEPENDS += "gtk+ clutter-1.4"
EXTRA_OECONF += "--disable-introspection"
diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
index a42a6c5..bdfcb91 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
STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+ libxi"
BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
-DEPENDS = "${STDDEPENDS} virtual/libgl"
+DEPENDS = "${STDDEPENDS} virtual/libgl gettext"
EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
DEPENDS_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 0000000..52fdcb4
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch
@@ -0,0 +1,13 @@
+Index: git/tests/interactive/Makefile.am
+===================================================================
+--- git.orig/tests/interactive/Makefile.am 2011-01-28 14:06:29.000000000 +0800
++++ git/tests/interactive/Makefile.am 2011-01-28 14:26:59.000000000 +0800
+@@ -107,7 +107,7 @@
+
+ common_ldadd = $(top_builddir)/clutter/libclutter- at CLUTTER_SONAME_INFIX@- at CLUTTER_API_VERSION@.la
+
+-noinst_PROGRAMS = test-interactive
++bin_PROGRAMS = test-interactive
+
+ test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
+ 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 0000000..ce412ff
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch
@@ -0,0 +1,66 @@
+Compiling conformance test leads running test-conformance target binary, and
+gets failure in cross-compile environment. Introduce this commit from upstream
+to fix it.
+
+Signed-off-by: Zhai Edwin <edwin.zhai at intel.com>
+
+
+commit 7fd6273c25569fe4f37ad371532d93e5170e51f7
+Author: Neil Roberts <neil at linux.intel.com>
+Date: Mon Oct 11 16:16:45 2010 +0100
+
+ tests: Generate the stub scripts using sed
+
+ Instead of trying to run ./test-conformance with the -l option to
+ generate a list of available tests it now runs sed on the
+ test-conform-main.c file instead. Running the generated executable is
+ a pain for cross-compiling so it would be nice to avoid it unless it's
+ absolutely necessary. Although you could tell people who are cross
+ compiling to just disable the conformance tests, this seems a shame
+ because they could still be useful along with the wrappers for example
+ if the cross compile is built to a shared network folder where the
+ tests can be run on the actual device.
+
+ The sed script is a little more ugly than it could be because it tries
+ to avoid using the GNU extensions '\+' and '\|'.
+
+ The script ends up placing restrictions on the format of the C file
+ because the tests must all be listed on one line each. There is now a
+ comment to explain this. Hopefully the trade off is worth it.
+
+ http://bugzilla.clutter-project.org/show_bug.cgi?id=2363
+
+diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
+index 3036639..1e723e7 100644
+--- a/tests/conform/Makefile.am
++++ b/tests/conform/Makefile.am
+@@ -89,9 +89,11 @@ test_conformance_SOURCES = $(common_sources) $(units_sources)
+
+ wrappers: stamp-test-conformance
+ @true
+-stamp-test-conformance: Makefile test-conformance$(EXEEXT)
++stamp-test-conformance: Makefile $(srcdir)/test-conform-main.c
+ @mkdir -p wrappers
+- @( $(abs_builddir)/test-conformance$(EXEEXT) -l -m thorough | $(GREP) '^/' ) > unit-tests
++ @sed -n -e 's/^ \{1,\}TEST_CONFORM_SIMPLE *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \
++ -e 's/^ \{1,\}TEST_CONFORM_SKIP *(.*"\([^",]\{1,\}\)", *\([a-zA-Z0-9_]\{1,\}\).*/\/conform\1\/\2/p' \
++ $(srcdir)/test-conform-main.c > unit-tests
+ @chmod +x test-launcher.sh
+ @( echo "/stamp-test-conformance" ; \
+ echo "/test-conformance" ; \
+diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
+index a8b3cf8..2ae7a04 100644
+--- a/tests/conform/test-conform-main.c
++++ b/tests/conform/test-conform-main.c
+@@ -92,6 +92,11 @@ main (int argc, char **argv)
+ {
+ clutter_test_init (&argc, &argv);
+
++ /* This file is run through a sed script during the make step so the
++ lines containing the tests need to be formatted on a single line
++ each. To comment out a test use the SKIP or TODO macros. Using
++ #if 0 would break the script. */
++
+ TEST_CONFORM_SIMPLE ("/timeline", test_timeline);
+ TEST_CONFORM_SKIP (!g_test_slow (), "/timeline", test_timeline_interpolate);
+ 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 1968591..13d6fc7 100644
--- a/meta/recipes-graphics/clutter/tidy.inc
+++ b/meta/recipes-graphics/clutter/tidy.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Tidy library"
HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPLv2.1+"
-STDDEPENDS = "clutter-1.0"
+STDDEPENDS = "clutter-1.4"
BASE_CONF = "--disable-gtk-doc"
DEPENDS = "${STDDEPENDS}"
diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc
index cf42e42..a734cdd 100644
--- a/meta/recipes-graphics/mutter/mutter.inc
+++ b/meta/recipes-graphics/mutter/mutter.inc
@@ -1,7 +1,7 @@
SECTION = "x11/wm"
DESCRIPTION = "Metacity is the boring window manager for the adult in you. Mutter is metacity + clutter."
LICENSE = "GPLv2"
-DEPENDS = "startup-notification gtk+ gconf clutter-1.0 gdk-pixbuf-native intltool glib-2.0-native"
+DEPENDS = "startup-notification gtk+ gconf clutter-1.4 gdk-pixbuf-native intltool glib-2.0-native"
# gobject-introspection
inherit gnome update-alternatives
diff --git a/meta/recipes-graphics/tasks/task-poky-clutter.bb b/meta/recipes-graphics/tasks/task-poky-clutter.bb
index e7e6364..f740d74 100644
--- a/meta/recipes-graphics/tasks/task-poky-clutter.bb
+++ b/meta/recipes-graphics/tasks/task-poky-clutter.bb
@@ -24,7 +24,7 @@ PACKAGES = "\
ALLOW_EMPTY = "1"
RDEPENDS_task-poky-clutter-core = "\
- clutter-1.0 \
+ clutter-1.4 \
clutter-gst-1.0 \
clutter-gtk-1.0"
--
1.7.0.4
More information about the poky
mailing list