diff options
28 files changed, 191 insertions, 98 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index 92b40ad328..2c49473c0f 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc @@ -20,10 +20,19 @@ SRCDATE_yaffs2-utils = "20071107" PV_pn-calibrateproto ?= "0.0-poky1-${SRCREV}" SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" SRCREV_pn-clipboard-manager ?= "14994" -SRCREV_pn-clutter-box2d = "3197" -SRCREV_pn-clutter-cairo ?= "3210" -SRCREV_pn-clutter-gst ?= "3188" -SRCREV_pn-clutter ?= "3240" +SRCREV_pn-clutter-box2d = "3326" +SRCREV_pn-clutter-cairo-0.6 ?= "2754" +SRCREV_pn-clutter-cairo-0.8 ?= "3322" +SRCREV_pn-clutter-cairo ?= "3313" +SRCREV_pn-clutter-gst-0.6 ?= "2961" +SRCREV_pn-clutter-gst-0.8 ?= "3351" +SRCREV_pn-clutter-gst ?= "3349" +SRCREV_pn-clutter-gtk-0.6 ?= "2961" +SRCREV_pn-clutter-gtk-0.8 ?= "3350" +SRCREV_pn-clutter-gtk ?= "3349" +SRCREV_pn-clutter-0.6 ?= "2816" +SRCREV_pn-clutter-0.8 ?= "3323" +SRCREV_pn-clutter ?= "3334" SRCREV_pn-dialer ?= "42a2b4dd62cf94dc905caeb087f5e7e9f418bf93" SRCREV_pn-dbus-wait ?= "402" SRCREV_pn-eds-dbus ?= "691" diff --git a/meta/packages/clutter/aaina.inc b/meta/packages/clutter/aaina.inc index fbef34f563..1baccc730c 100644 --- a/meta/packages/clutter/aaina.inc +++ b/meta/packages/clutter/aaina.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Aaina Clutter Demo" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "GPL" -DEPENDS = "clutter libxml2 gtk+ neon" +DEPENDS = "clutter-0.6 libxml2 gtk+ neon" inherit autotools pkgconfig diff --git a/meta/packages/clutter/clutter_0.6svn.bb b/meta/packages/clutter/clutter-0.6_svn.bb index 79882d6ddf..79882d6ddf 100644 --- a/meta/packages/clutter/clutter_0.6svn.bb +++ b/meta/packages/clutter/clutter-0.6_svn.bb diff --git a/meta/packages/clutter/clutter-0.8_svn.bb b/meta/packages/clutter/clutter-0.8_svn.bb new file mode 100644 index 0000000000..c8315a2421 --- /dev/null +++ b/meta/packages/clutter/clutter-0.8_svn.bb @@ -0,0 +1,11 @@ +require clutter.inc + +PE = "1" +PR = "r0" +PV = "0.8.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-8;proto=http \ + file://enable_tests-0.8.patch;patch=1 " + +S = "${WORKDIR}/clutter-0-8" + diff --git a/meta/packages/clutter/clutter-box2d.inc b/meta/packages/clutter/clutter-box2d.inc index 8189d12bbb..c5cd3283e2 100644 --- a/meta/packages/clutter/clutter-box2d.inc +++ b/meta/packages/clutter/clutter-box2d.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Clutter Box2D" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "GPLv2" -DEPENDS = "clutter" +DEPENDS = "clutter-0.8" # The main clutter lib is machine specific so we need to be too PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta/packages/clutter/clutter-cairo-0.6_svn.bb b/meta/packages/clutter/clutter-cairo-0.6_svn.bb new file mode 100644 index 0000000000..b07bdac5a0 --- /dev/null +++ b/meta/packages/clutter/clutter-cairo-0.6_svn.bb @@ -0,0 +1,12 @@ +require clutter-cairo.inc + +PV = "0.8.0+svnr${SRCREV}" + +DEPENDS += "clutter-0.6" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-cairo-0-8;proto=http \ + file://enable_examples.patch;patch=1" + +S = "${WORKDIR}/${PN}" + + diff --git a/meta/packages/clutter/clutter-cairo-0.8_svn.bb b/meta/packages/clutter/clutter-cairo-0.8_svn.bb new file mode 100644 index 0000000000..53d1f712cf --- /dev/null +++ b/meta/packages/clutter/clutter-cairo-0.8_svn.bb @@ -0,0 +1,12 @@ +require clutter-cairo.inc + +PV = "0.8.0+svnr${SRCREV}" + +DEPENDS += "clutter-0.8" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-cairo-0-8;proto=http \ + file://enable_examples.patch;patch=1" + +S = "${WORKDIR}/${PN}" + + diff --git a/meta/packages/clutter/clutter-cairo.inc b/meta/packages/clutter/clutter-cairo.inc index 1095a7e8ef..3a94c35ad6 100644 --- a/meta/packages/clutter/clutter-cairo.inc +++ b/meta/packages/clutter/clutter-cairo.inc @@ -2,7 +2,9 @@ DESCRIPTION = "Clutter Cairo" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPL" -DEPENDS = "clutter cairo" +DEPENDS = "cairo" + +FILESPATH = "${FILE_DIRNAME}/clutter-cairo" PACKAGES =+ "${PN}-examples" FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock" diff --git a/meta/packages/clutter/clutter-cairo_svn.bb b/meta/packages/clutter/clutter-cairo_svn.bb index 1084c1cc16..5059bb518f 100644 --- a/meta/packages/clutter/clutter-cairo_svn.bb +++ b/meta/packages/clutter/clutter-cairo_svn.bb @@ -1,6 +1,7 @@ require clutter-cairo.inc PV = "0.8.0+svnr${SRCREV}" +PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ file://enable_examples.patch;patch=1" diff --git a/meta/packages/clutter/clutter-gst-0.6_svn.bb b/meta/packages/clutter/clutter-gst-0.6_svn.bb new file mode 100644 index 0000000000..75f6019f5d --- /dev/null +++ b/meta/packages/clutter/clutter-gst-0.6_svn.bb @@ -0,0 +1,10 @@ +require clutter-gst.inc + +PV = "0.6.0+svnr${SRCREV}" + +DEPENDS += "clutter-0.6" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-6;proto=http" + + +S = "${WORKDIR}/clutter-gst-0-6" diff --git a/meta/packages/clutter/clutter-gst-0.8_svn.bb b/meta/packages/clutter/clutter-gst-0.8_svn.bb new file mode 100644 index 0000000000..0f175b2b1d --- /dev/null +++ b/meta/packages/clutter/clutter-gst-0.8_svn.bb @@ -0,0 +1,10 @@ +require clutter-gst.inc + +PV = "0.8.0+svnr${SRCREV}" + +DEPENDS += "clutter-0.8" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-8;proto=http" + + +S = "${WORKDIR}/clutter-gst-0-8" diff --git a/meta/packages/clutter/clutter-gst.inc b/meta/packages/clutter/clutter-gst.inc index caaa7559b8..ad921bd0c0 100644 --- a/meta/packages/clutter/clutter-gst.inc +++ b/meta/packages/clutter/clutter-gst.inc @@ -2,16 +2,14 @@ DESCRIPTION = "Clutter GStreamer" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPL" -DEPENDS = "clutter gstreamer gst-plugins-base" +DEPENDS = "gstreamer gst-plugins-base" + +FILESPATH = "${FILE_DIRNAME}/clutter-gst" PACKAGES =+ "${PN}-examples" FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio" -inherit autotools pkgconfig - -do_configure_prepend() { - touch ${S}/gtk-doc.make -} +inherit autotools pkgconfig gtk-doc do_stage () { autotools_stage_all diff --git a/meta/packages/clutter/clutter-gst_0.4svn.bb b/meta/packages/clutter/clutter-gst_0.4svn.bb deleted file mode 100644 index 1af797888c..0000000000 --- a/meta/packages/clutter/clutter-gst_0.4svn.bb +++ /dev/null @@ -1,9 +0,0 @@ -require clutter-gst.inc - -PV = "0.4.0+svnr${SRCREV}" - -SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-4;proto=http \ - file://autofoo-0.4.patch;patch=1" - - -S = "${WORKDIR}/clutter-gst-0-4" diff --git a/meta/packages/clutter/clutter-gst_svn.bb b/meta/packages/clutter/clutter-gst_svn.bb index 8ef87236f7..b41e28c8d9 100644 --- a/meta/packages/clutter/clutter-gst_svn.bb +++ b/meta/packages/clutter/clutter-gst_svn.bb @@ -1,6 +1,7 @@ require clutter-gst.inc PV = "0.8.0+svnr${SRCREV}" +PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ file://autofoo.patch;patch=1" diff --git a/meta/packages/clutter/clutter-gtk-0.6_svn.bb b/meta/packages/clutter/clutter-gtk-0.6_svn.bb new file mode 100644 index 0000000000..d89c2873f3 --- /dev/null +++ b/meta/packages/clutter/clutter-gtk-0.6_svn.bb @@ -0,0 +1,10 @@ +require clutter-gtk.inc + +PV = "0.6.0+svnr${SRCREV}" + +DEPENDS += "clutter-0.6" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gtk-0-6;proto=http" + + +S = "${WORKDIR}/clutter-gtk-0-6" diff --git a/meta/packages/clutter/clutter-gtk-0.8_svn.bb b/meta/packages/clutter/clutter-gtk-0.8_svn.bb new file mode 100644 index 0000000000..1767942e5b --- /dev/null +++ b/meta/packages/clutter/clutter-gtk-0.8_svn.bb @@ -0,0 +1,10 @@ +require clutter-gtk.inc + +PV = "0.8.0+svnr${SRCREV}" + +DEPENDS += "clutter-0.8" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gtk-0-8;proto=http" + + +S = "${WORKDIR}/clutter-gtk-0-8" diff --git a/meta/packages/clutter/clutter-gtk.inc b/meta/packages/clutter/clutter-gtk.inc new file mode 100644 index 0000000000..0545571b44 --- /dev/null +++ b/meta/packages/clutter/clutter-gtk.inc @@ -0,0 +1,17 @@ +DESCRIPTION = "Clutter GTK+" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL" + +DEPENDS = "gtk+" + +FILESPATH = "${FILE_DIRNAME}/clutter-gtk" + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage" + +inherit autotools pkgconfig gtk-doc + +do_stage () { + autotools_stage_all +} + diff --git a/meta/packages/clutter/clutter-gtk_svn.bb b/meta/packages/clutter/clutter-gtk_svn.bb new file mode 100644 index 0000000000..007aa4ae65 --- /dev/null +++ b/meta/packages/clutter/clutter-gtk_svn.bb @@ -0,0 +1,9 @@ +require clutter-gst.inc + +PV = "0.8.0+svnr${SRCREV}" +PR = "r0" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ + file://autofoo.patch;patch=1" + +S = "${WORKDIR}/${PN}" diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc index 76018b25d1..5ff179c149 100644 --- a/meta/packages/clutter/clutter.inc +++ b/meta/packages/clutter/clutter.inc @@ -35,6 +35,8 @@ EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative" PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " +FILESPATH = "${FILE_DIRNAME}/clutter" + inherit autotools pkgconfig gtk-doc PACKAGES =+ "clutter-examples" diff --git a/meta/packages/clutter/clutter/enable_tests-0.4.patch b/meta/packages/clutter/clutter/enable_tests-0.4.patch deleted file mode 100644 index 3178a2cd6c..0000000000 --- a/meta/packages/clutter/clutter/enable_tests-0.4.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- - tests/Makefile.am | 7 ++++++- - tests/test-actors.c | 2 +- - tests/test-text.c | 2 +- - 3 files changed, 8 insertions(+), 3 deletions(-) - -Index: clutter-0-4/tests/Makefile.am -=================================================================== ---- clutter-0-4.orig/tests/Makefile.am 2007-11-06 21:49:25.000000000 +0000 -+++ clutter-0-4/tests/Makefile.am 2007-11-06 21:49:48.000000000 +0000 -@@ -1,4 +1,4 @@ --noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ -+bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ - test-actors test-behave test-text test-entry test-project \ - test-boxes test-perspective test-rotate test-depth \ - test-threads test-timeline -@@ -24,4 +24,9 @@ test_depth_SOURCES = test-depth.c - test_threads_SOURCES = test-threads.c - test_timeline_SOURCES = test-timeline.c - -+test_textdir = $(pkgdatadir) -+test_text_DATA = test-text.c -+test_actorsdir = $(pkgdatadir) -+test_actors_DATA = redhand.png -+ - EXTRA_DIST = redhand.png -Index: clutter-0-4/tests/test-actors.c -=================================================================== ---- clutter-0-4.orig/tests/test-actors.c 2007-11-06 21:49:25.000000000 +0000 -+++ clutter-0-4/tests/test-actors.c 2007-11-06 21:49:28.000000000 +0000 -@@ -143,7 +143,7 @@ main (int argc, char *argv[]) - stage = clutter_stage_get_default (); - clutter_actor_set_size (stage, 800, 600); - -- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL); -+ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL); - - if (!pixbuf) - g_error("pixbuf load failed"); -Index: clutter-0-4/tests/test-text.c -=================================================================== ---- clutter-0-4.orig/tests/test-text.c 2007-11-06 21:49:25.000000000 +0000 -+++ clutter-0-4/tests/test-text.c 2007-11-06 21:49:28.000000000 +0000 -@@ -27,7 +27,7 @@ main (int argc, char *argv[]) - - stage = clutter_stage_get_default (); - -- if (!g_file_get_contents ("test-text.c", &text, &size, NULL)) -+ if (!g_file_get_contents ("/usr/share/clutter/test-text.c", &text, &size, NULL)) - g_error("g_file_get_contents() of test-text.c failed"); - - clutter_actor_set_size (stage, 800, 600); diff --git a/meta/packages/clutter/clutter/enable_tests-0.8.patch b/meta/packages/clutter/clutter/enable_tests-0.8.patch new file mode 100644 index 0000000000..4f449b1177 --- /dev/null +++ b/meta/packages/clutter/clutter/enable_tests-0.8.patch @@ -0,0 +1,50 @@ +--- + tests/Makefile.am | 7 ++++++- + tests/test-actors.c | 2 +- + tests/test-text.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Index: clutter/tests/Makefile.am +=================================================================== +--- clutter.orig/tests/Makefile.am 2008-06-26 16:46:26.000000000 +0100 ++++ clutter/tests/Makefile.am 2008-06-26 16:46:50.000000000 +0100 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ ++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ + test-actors test-behave test-text test-entry test-project \ + test-perspective test-rotate test-depth \ + test-threads test-timeline test-timeline-dup-frames \ +@@ -17,8 +17,8 @@ + test-invariants + + if X11_TESTS +-noinst_PROGRAMS += test-pixmap +-noinst_PROGRAMS += test-devices ++bin_PROGRAMS += test-pixmap ++bin_PROGRAMS += test-devices + endif + + INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter +@@ -73,4 +73,9 @@ + test_invariants_SOURCES = test-invariants.c + test_devices_SOURCES = test-devices.c + ++test_textdir = $(pkgdatadir) ++test_text_DATA = test-text.c ++test_actorsdir = $(pkgdatadir) ++test_actors_DATA = redhand.png ++ + EXTRA_DIST = redhand.png test-script.json +Index: clutter/tests/test-actors.c +=================================================================== +--- clutter.orig/tests/test-actors.c 2008-06-26 16:46:26.000000000 +0100 ++++ clutter/tests/test-actors.c 2008-06-26 16:46:31.000000000 +0100 +@@ -195,7 +195,7 @@ + /* Create a texture from file, then clone in to same resources */ + if (i == 0) + { +- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png", ++ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", + &error)) == NULL) + { + g_error ("image load failed: %s", error->message); diff --git a/meta/packages/clutter/clutter_0.4svn.bb b/meta/packages/clutter/clutter_0.4svn.bb deleted file mode 100644 index fe1fbc29d3..0000000000 --- a/meta/packages/clutter/clutter_0.4svn.bb +++ /dev/null @@ -1,13 +0,0 @@ -require clutter.inc - -PV = "0.4.0+svnr${SRCREV}" - -SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-4;proto=http \ - file://enable_tests-0.4.patch;patch=1 " - -S = "${WORKDIR}/clutter-0-4" - -do_stage () { - cp ${S}/clutter.pc ${S}/clutter-0.4.pc - autotools_stage_all -} diff --git a/meta/packages/clutter/clutter_svn.bb b/meta/packages/clutter/clutter_svn.bb index cf88871ae0..150828ce5d 100644 --- a/meta/packages/clutter/clutter_svn.bb +++ b/meta/packages/clutter/clutter_svn.bb @@ -1,7 +1,7 @@ require clutter.inc PV = "0.8.0+svnr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ file://enable_tests.patch;patch=1;maxrev=2989 \ diff --git a/meta/packages/clutter/table.inc b/meta/packages/clutter/table.inc index 6ee1672197..b07b39dc1e 100644 --- a/meta/packages/clutter/table.inc +++ b/meta/packages/clutter/table.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Table Clutter Demo" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPL" -DEPENDS = "clutter-gst gnome-vfs" +DEPENDS = "clutter-gst-0.6 gnome-vfs" inherit autotools pkgconfig diff --git a/meta/packages/clutter/table_svn.bb b/meta/packages/clutter/table_svn.bb index 168ea4dfba..e293ff3ca2 100644 --- a/meta/packages/clutter/table_svn.bb +++ b/meta/packages/clutter/table_svn.bb @@ -1,6 +1,7 @@ require table.inc PV = "0.3.0+svnr${SRCREV}" +PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=table;proto=http \ file://fixes.patch;patch=1" diff --git a/meta/packages/clutter/tidy.inc b/meta/packages/clutter/tidy.inc index bac910a4f4..d1f11976cd 100644 --- a/meta/packages/clutter/tidy.inc +++ b/meta/packages/clutter/tidy.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Tidy library" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPL" -STDDEPENDS = "clutter" +STDDEPENDS = "clutter-0.8" BASE_CONF = "--disable-gtk-doc" DEPENDS = "${STDDEPENDS}" diff --git a/meta/packages/clutter/tidy_svn.bb b/meta/packages/clutter/tidy_svn.bb index 348bba0a8e..8d9f3ac516 100644 --- a/meta/packages/clutter/tidy_svn.bb +++ b/meta/packages/clutter/tidy_svn.bb @@ -1,7 +1,7 @@ require tidy.inc PV = "0.1.0+svnr${SRCREV}" -PR = "6" +PR = "r7" SRC_URI = "svn://svn.o-hand.com/repos/tidy;module=trunk;proto=http \ file://tidy-enable-tests.patch;patch=1" diff --git a/meta/packages/tasks/task-poky-clutter.bb b/meta/packages/tasks/task-poky-clutter.bb index fb5abd500e..4393ec269c 100644 --- a/meta/packages/tasks/task-poky-clutter.bb +++ b/meta/packages/tasks/task-poky-clutter.bb @@ -3,7 +3,7 @@ # DESCRIPTION = "Clutter Tasks for OpenedHand Poky" -PR = "r2" +PR = "r3" PACKAGES = "\ task-poky-clutter-core \ @@ -20,14 +20,16 @@ PACKAGES = "\ ALLOW_EMPTY = "1" RDEPENDS_task-poky-clutter-core = "\ - clutter \ - clutter-cairo \ - clutter-gst" + clutter-0.8 \ + clutter-cairo-0.8 \ + clutter-gst-0.8 \ + clutter-gtk-0.8" RDEPENDS_task-poky-clutter-tests = "\ - clutter-examples \ - clutter-cairo-examples \ - clutter-gst-examples" + clutter-0.8-examples \ + clutter-cairo-0.8-examples \ + clutter-gst-0.8-examples \ + clutter-gtk-0.8-examples" RDEPENDS_task-poky-clutter-apps = "\ aaina \ |