merge of '080fcdca01d44047b988dbb0ff626190537f5cae'

     and '22bb42838bf1d7404d344ae172f39130008bc2c7'

60 files changed, 1377 insertions, 264 deletions

diff --git a/packages/cairo/cairo_1.6.4.bb b/packages/cairo/cairo_1.6.4.bb
index 53a71f71df..9cac359636 100644
--- a/packages/cairo/cairo_1.6.4.bb
+++ b/packages/cairo/cairo_1.6.4.bb
@@ -5,5 +5,5 @@ DEFAULT_PREFERENCE = "-1"
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
            file://configure_fix.patch;patch=1 "
 
-PR = "r2"
+PR = "r3"
 
diff --git a/packages/clutter/aaina.inc b/packages/clutter/aaina.inc
new file mode 100644
index 0000000000..fbef34f563
--- /dev/null
+++ b/packages/clutter/aaina.inc
@@ -0,0 +1,12 @@
+DESCRIPTION = "Aaina Clutter Demo"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "GPL"
+
+DEPENDS = "clutter libxml2 gtk+ neon"
+
+inherit autotools pkgconfig
+
+do_stage () {
+        autotools_stage_all
+}
+
diff --git a/packages/clutter/aaina_svn.bb b/packages/clutter/aaina_svn.bb
new file mode 100644
index 0000000000..52a2b3ae0e
--- /dev/null
+++ b/packages/clutter/aaina_svn.bb
@@ -0,0 +1,7 @@
+require aaina.inc
+
+PV = "0.3.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=aaina;proto=http"
+
+S = "${WORKDIR}/aaina"
diff --git a/packages/clutter/clutter-box2d.inc b/packages/clutter/clutter-box2d.inc
new file mode 100644
index 0000000000..8189d12bbb
--- /dev/null
+++ b/packages/clutter/clutter-box2d.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "Clutter Box2D"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "GPLv2"
+
+DEPENDS = "clutter"
+
+# The main clutter lib is machine specific so we need to be too
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit autotools pkgconfig gtk-doc
+
+do_stage () {
+        autotools_stage_all
+}
+
+do_install_append () {
+	install -d ${D}${bindir}
+	install ${S}/examples/.libs/blockbox ${D}${bindir}
+}
diff --git a/packages/clutter/clutter-box2d_svn.bb b/packages/clutter/clutter-box2d_svn.bb
new file mode 100644
index 0000000000..f241622a50
--- /dev/null
+++ b/packages/clutter/clutter-box2d_svn.bb
@@ -0,0 +1,10 @@
+require clutter-box2d.inc
+
+PV = "0.0+svnr${SRCREV}"
+PR = "r3"
+
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http"
+
+S = "${WORKDIR}/${PN}"
+
+
diff --git a/packages/clutter/clutter-cairo.inc b/packages/clutter/clutter-cairo.inc
new file mode 100644
index 0000000000..1095a7e8ef
--- /dev/null
+++ b/packages/clutter/clutter-cairo.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "Clutter Cairo"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPL"
+
+DEPENDS = "clutter cairo"
+
+PACKAGES =+ "${PN}-examples"
+FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock"
+
+inherit autotools pkgconfig
+
+do_stage () {
+        autotools_stage_all
+}
+
diff --git a/packages/clutter/clutter-cairo/.mtn2git_empty b/packages/clutter/clutter-cairo/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/clutter/clutter-cairo/.mtn2git_empty
diff --git a/packages/clutter/clutter-cairo/enable_examples.patch b/packages/clutter/clutter-cairo/enable_examples.patch
new file mode 100644
index 0000000000..c5ed63ff12
--- /dev/null
+++ b/packages/clutter/clutter-cairo/enable_examples.patch
@@ -0,0 +1,28 @@
+---
+ examples/Makefile.am |    2 +-
+ examples/flowers.c   |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: clutter-cairo/examples/Makefile.am
+===================================================================
+--- clutter-cairo.orig/examples/Makefile.am	2008-08-11 16:30:04.000000000 +0100
++++ clutter-cairo/examples/Makefile.am	2008-08-11 16:30:24.000000000 +0100
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = clock flowers bubbles
++bin_PROGRAMS = clock flowers bubbles
+ 
+ INCLUDES = -I$(top_srcdir)/ @GCC_FLAGS@ @DEPS_CFLAGS@
+ AM_LDFLAGS = @DEPS_LIBS@ $(top_builddir)/libclutter-cairo-@CLUTTER_CAIRO_MAJORMINOR@.la 
+Index: clutter-cairo/examples/flowers.c
+===================================================================
+--- clutter-cairo.orig/examples/flowers.c	2008-08-11 16:30:04.000000000 +0100
++++ clutter-cairo/examples/flowers.c	2008-08-11 16:30:10.000000000 +0100
+@@ -11,7 +11,7 @@
+ 
+ #define PETAL_MIN 20
+ #define PETAL_VAR 40
+-#define N_FLOWERS 40 /* reduce if you have a small card */
++#define N_FLOWERS 8 /* reduce if you have a small card */
+ 
+ typedef struct Flower
+ {
diff --git a/packages/clutter/clutter-cairo_svn.bb b/packages/clutter/clutter-cairo_svn.bb
new file mode 100644
index 0000000000..1084c1cc16
--- /dev/null
+++ b/packages/clutter/clutter-cairo_svn.bb
@@ -0,0 +1,10 @@
+require clutter-cairo.inc
+
+PV = "0.8.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
+           file://enable_examples.patch;patch=1"
+
+S = "${WORKDIR}/${PN}"
+
+
diff --git a/packages/clutter/clutter-gst.inc b/packages/clutter/clutter-gst.inc
new file mode 100644
index 0000000000..caaa7559b8
--- /dev/null
+++ b/packages/clutter/clutter-gst.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "Clutter GStreamer"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPL"
+
+DEPENDS = "clutter gstreamer gst-plugins-base"
+
+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
+}
+
+do_stage () {
+        autotools_stage_all
+}
+
diff --git a/packages/clutter/clutter-gst/.mtn2git_empty b/packages/clutter/clutter-gst/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/clutter/clutter-gst/.mtn2git_empty
diff --git a/packages/clutter/clutter-gst/autofoo-0.4.patch b/packages/clutter/clutter-gst/autofoo-0.4.patch
new file mode 100644
index 0000000000..54df63d297
--- /dev/null
+++ b/packages/clutter/clutter-gst/autofoo-0.4.patch
@@ -0,0 +1,15 @@
+---
+ doc/reference/Makefile.am |    2 +-
+ examples/Makefile.am      |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: clutter-gst/examples/Makefile.am
+===================================================================
+--- clutter-gst.orig/examples/Makefile.am	2007-11-06 12:31:36.000000000 +0000
++++ clutter-gst/examples/Makefile.am	2007-11-06 18:53:59.000000000 +0000
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = video-player video-sink audio
++bin_PROGRAMS = video-player video-sink audio
+ 
+ INCLUDES = -I$(top_srcdir)/
+ 
diff --git a/packages/clutter/clutter-gst/autofoo.patch b/packages/clutter/clutter-gst/autofoo.patch
new file mode 100644
index 0000000000..569b0d8be9
--- /dev/null
+++ b/packages/clutter/clutter-gst/autofoo.patch
@@ -0,0 +1,25 @@
+---
+ doc/reference/Makefile.am |    2 +-
+ examples/Makefile.am      |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: clutter-gst/examples/Makefile.am
+===================================================================
+--- clutter-gst.orig/examples/Makefile.am	2007-11-06 12:31:36.000000000 +0000
++++ clutter-gst/examples/Makefile.am	2007-11-06 18:53:59.000000000 +0000
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = video-player video-sink audio
++bin_PROGRAMS = video-player video-sink audio
+ 
+ INCLUDES = -I$(top_srcdir)/
+ 
+Index: clutter-gst/doc/reference/Makefile.am
+===================================================================
+--- clutter-gst.orig/doc/reference/Makefile.am	2007-11-06 19:36:56.000000000 +0000
++++ clutter-gst/doc/reference/Makefile.am	2007-11-06 19:37:02.000000000 +0000
+@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make
+ 
+ # Other files to distribute
+ # e.g. EXTRA_DIST += version.xml.in
+-EXTRA_DIST += version.xml.in
++EXTRA_DIST = version.xml.in
diff --git a/packages/clutter/clutter-gst_0.4svn.bb b/packages/clutter/clutter-gst_0.4svn.bb
new file mode 100644
index 0000000000..1af797888c
--- /dev/null
+++ b/packages/clutter/clutter-gst_0.4svn.bb
@@ -0,0 +1,9 @@
+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/packages/clutter/clutter-gst_svn.bb b/packages/clutter/clutter-gst_svn.bb
new file mode 100644
index 0000000000..8ef87236f7
--- /dev/null
+++ b/packages/clutter/clutter-gst_svn.bb
@@ -0,0 +1,8 @@
+require clutter-gst.inc
+
+PV = "0.8.0+svnr${SRCREV}"
+
+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/packages/clutter/clutter.inc b/packages/clutter/clutter.inc
index b89070f3ea..63773ad530 100644
--- a/packages/clutter/clutter.inc
+++ b/packages/clutter/clutter.inc
@@ -2,20 +2,47 @@ DESCRIPTION = "Clutter graphics library"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPL"
 
-DEPENDS = "virtual/libx11 mesa gstreamer gtk-doc cairo pango gtk+"
+COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-34030sdp|mx31ads|qemuarm|qemux86|ipodtouch|beagleboard|overo|omap3evm)"
 
-inherit autotools pkgconfig
+STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+"
+BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
 
-EXTRA_OECONF = "--disable-gtk-doc "
+DEPENDS = "${STDDEPENDS} mesa"
+EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
+
+DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib"
+EXTRA_OECONF_zylonite = "${BASE_CONF} --with-flavour=eglnative"
+PACKAGE_ARCH_zylonite = "${MACHINE_ARCH}"
+LDFLAGS_append_zylonite = " -lnws -lstdc++ "
+
+DEPENDS_mx31litekit = "${STDDEPENDS} libgles-mx31 tslib"
+EXTRA_OECONF_mx31litekit = "${BASE_CONF} --with-flavour=eglnative"
+PACKAGE_ARCH_mx31litekit = "${MACHINE_ARCH}"
+LDFLAGS_append_mx31litekit = " -lpvrNULLWSEGL -lstdc++ "
+
+DEPENDS_omap-3430ldp = "${STDDEPENDS} libgles-omap3 tslib"
+EXTRA_OECONF_omap-3430ldp = "${BASE_CONF} --with-flavour=eglx"
+PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}"
+
+DEPENDS_omap-3430sdp = "${STDDEPENDS} libgles-omap3 tslib"
+EXTRA_OECONF_omap-3430sdp = "${BASE_CONF} --with-flavour=eglx"
+PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}"
+
+DEPENDS_mx31ads = "${STDDEPENDS} libgles-mx31 tslib"
+EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative"
+PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}"
+LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ "
+
+inherit autotools pkgconfig gtk-doc
+
+PACKAGES =+ "clutter-examples"
+FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
 
 #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
 require clutter-fpu.inc
 
-EXTRA_OECONF += "${@get_clutter_fpu_setting(bb, d)}"
-
 #Fix up some weirdness in the docs
 do_configure_prepend() {
-	touch ${S}/gtk-doc.make
         sed -i s:doc/reference/Makefile::g ${S}/configure.ac
         sed -i s:doc::g ${S}/Makefile.am
 }
@@ -23,4 +50,3 @@ do_configure_prepend() {
 do_stage () {
         autotools_stage_all
 }
-
diff --git a/packages/clutter/clutter/.mtn2git_empty b/packages/clutter/clutter/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/clutter/clutter/.mtn2git_empty
diff --git a/packages/clutter/clutter/enable-tests-r2990.patch b/packages/clutter/clutter/enable-tests-r2990.patch
new file mode 100644
index 0000000000..4f449b1177
--- /dev/null
+++ b/packages/clutter/clutter/enable-tests-r2990.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/packages/clutter/clutter/enable_tests-0.4.patch b/packages/clutter/clutter/enable_tests-0.4.patch
new file mode 100644
index 0000000000..3178a2cd6c
--- /dev/null
+++ b/packages/clutter/clutter/enable_tests-0.4.patch
@@ -0,0 +1,52 @@
+---
+ 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/packages/clutter/clutter/enable_tests-0.6.patch b/packages/clutter/clutter/enable_tests-0.6.patch
new file mode 100644
index 0000000000..544a7e588c
--- /dev/null
+++ b/packages/clutter/clutter/enable_tests-0.6.patch
@@ -0,0 +1,40 @@
+---
+ tests/Makefile.am   |    7 ++++++-
+ tests/test-actors.c |    2 +-
+ tests/test-text.c   |    2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+Index: clutter-0-6/tests/Makefile.am
+===================================================================
+--- clutter.orig/tests/Makefile.am	2007-11-06 12:29:17.000000000 +0000
++++ clutter-0-6/tests/Makefile.am	2007-11-06 12:30:11.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 test-score test-script
+@@ -26,4 +26,9 @@ test_timeline_SOURCES  = test-timeline.c
+ test_score_SOURCES     = test-score.c
+ test_script_SOURCES    = test-script.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-0-6/tests/test-actors.c
+===================================================================
+--- clutter.orig/tests/test-actors.c	2007-11-06 12:29:17.000000000 +0000
++++ clutter-0-6/tests/test-actors.c	2007-11-06 12:29:21.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");
+
diff --git a/packages/clutter/clutter/enable_tests.patch b/packages/clutter/clutter/enable_tests.patch
new file mode 100644
index 0000000000..4a99968fa3
--- /dev/null
+++ b/packages/clutter/clutter/enable_tests.patch
@@ -0,0 +1,48 @@
+---
+ 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-04-25 16:45:17.000000000 +0100
++++ clutter/tests/Makefile.am	2008-04-25 16:47:12.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 \
+@@ -14,7 +14,7 @@
+ 		  test-cogl-tex-polygon test-stage-read-pixels
+ 
+ if X11_TESTS
+-noinst_PROGRAMS += test-pixmap
++bin_PROGRAMS += test-pixmap
+ endif
+ 
+ INCLUDES = -I$(top_srcdir)/ -I$(top_builddir)/clutter
+@@ -61,4 +61,9 @@
+ test_cogl_offscreen_SOURCES   = test-cogl-offscreen.c
+ test_stage_read_pixels_SOURCES = test-stage-read-pixels.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-04-25 16:45:17.000000000 +0100
++++ clutter/tests/test-actors.c	2008-04-25 16:45:17.000000000 +0100
+@@ -184,7 +184,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/packages/clutter/clutter_0.4svn.bb b/packages/clutter/clutter_0.4svn.bb
new file mode 100644
index 0000000000..fe1fbc29d3
--- /dev/null
+++ b/packages/clutter/clutter_0.4svn.bb
@@ -0,0 +1,13 @@
+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/packages/clutter/clutter_0.6svn.bb b/packages/clutter/clutter_0.6svn.bb
new file mode 100644
index 0000000000..79882d6ddf
--- /dev/null
+++ b/packages/clutter/clutter_0.6svn.bb
@@ -0,0 +1,8 @@
+require clutter.inc
+
+PV = "0.6.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-6;proto=http \
+	   file://enable_tests-0.6.patch;patch=1 "
+
+S = "${WORKDIR}/clutter-0-6"
diff --git a/packages/clutter/clutter_svn.bb b/packages/clutter/clutter_svn.bb
new file mode 100644
index 0000000000..cf88871ae0
--- /dev/null
+++ b/packages/clutter/clutter_svn.bb
@@ -0,0 +1,12 @@
+require clutter.inc
+
+PV = "0.8.0+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
+           file://enable_tests.patch;patch=1;maxrev=2989 \
+           file://enable-tests-r2990.patch;patch=1;minrev=2990"
+
+S = "${WORKDIR}/clutter"
+
+
diff --git a/packages/clutter/moblin-proto/.mtn2git_empty b/packages/clutter/moblin-proto/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/clutter/moblin-proto/.mtn2git_empty
diff --git a/packages/clutter/moblin-proto/fix.patch b/packages/clutter/moblin-proto/fix.patch
new file mode 100644
index 0000000000..8bde67762c
--- /dev/null
+++ b/packages/clutter/moblin-proto/fix.patch
@@ -0,0 +1,22 @@
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile	2008-08-11 22:49:48.000000000 +0100
++++ git/Makefile	2008-08-12 12:16:52.000000000 +0100
+@@ -15,7 +15,7 @@
+ 
+ SCP_DESTINATION=pug.vpn:tmp
+ 
+-BINARY=$(shell basename `pwd`)#
++BINARY=moblin-proto
+ PACKAGE=../$(BINARY).tar.bz2 # you can use both .gz and .bz2 as extension here
+ 
+ #CFLAGS= -Wall -I /home/pippin/src/clutter-box2d/clutter-box2d
+@@ -61,7 +61,7 @@
+ %.o: %.c $(HFILES)
+ 	$(CC) -g $(CFLAGS) $(INCS) -c $< -o$@
+ $(BINARY): $(OBJECTS)
+-	$(CC) -o $@ $(OBJECTS) $(LIBS)
++	$(CXX) -o $@ $(OBJECTS) $(LIBS)
+ 
+ #$(BINARY): $(CFILES)
+ #	$(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@
diff --git a/packages/clutter/moblin-proto/paths.patch b/packages/clutter/moblin-proto/paths.patch
new file mode 100644
index 0000000000..d241c8ff71
--- /dev/null
+++ b/packages/clutter/moblin-proto/paths.patch
@@ -0,0 +1,15 @@
+diff --git a/moblin-desktop.h b/moblin-desktop.h
+index 880a9ad..3d51a14 100644
+--- a/moblin-desktop.h
++++ b/moblin-desktop.h
+@@ -29,8 +29,8 @@
+ #define __MAIN_H__
+ 
+ 
+-#define ASSET_ROOT "./assets/"
+-#define JSON_ROOT "./layouts/"
++#define ASSET_ROOT "/usr/share/moblin-proto/assets/"
++#define JSON_ROOT "/usr/share/moblin-proto/layouts/"
+ 
+ typedef struct
+ {
diff --git a/packages/clutter/moblin-proto_git.bb b/packages/clutter/moblin-proto_git.bb
new file mode 100644
index 0000000000..8ce97bbeab
--- /dev/null
+++ b/packages/clutter/moblin-proto_git.bb
@@ -0,0 +1,18 @@
+DEPENDS = "clutter-box2d"
+
+PV = "0.0+git${SRCREV}"
+PR = "r1"
+
+SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \
+           file://paths.patch;patch=1"
+
+S = "${WORKDIR}/git"
+
+do_install () {
+	install -d ${D}${bindir}
+	install ${S}/moblin-proto ${D}${bindir}
+
+	install -d ${D}${datadir}/moblin-proto/
+        cp -a ${S}/assets ${D}${datadir}/moblin-proto/
+        cp -a ${S}/layouts ${D}${datadir}/moblin-proto/
+}
diff --git a/packages/clutter/table.inc b/packages/clutter/table.inc
new file mode 100644
index 0000000000..6ee1672197
--- /dev/null
+++ b/packages/clutter/table.inc
@@ -0,0 +1,17 @@
+DESCRIPTION = "Table Clutter Demo"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPL"
+
+DEPENDS = "clutter-gst gnome-vfs"
+
+inherit autotools pkgconfig
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 ${S}/table ${D}${bindir}/table
+}
+
+#do_stage () {
+#        autotools_stage_all
+#}
+
diff --git a/packages/clutter/table/.mtn2git_empty b/packages/clutter/table/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/clutter/table/.mtn2git_empty
diff --git a/packages/clutter/table/fixes.patch b/packages/clutter/table/fixes.patch
new file mode 100644
index 0000000000..a7cdc43713
--- /dev/null
+++ b/packages/clutter/table/fixes.patch
@@ -0,0 +1,14 @@
+Index: table/Makefile
+===================================================================
+--- table.orig/Makefile	2007-07-10 13:24:18.000000000 +0100
++++ table/Makefile	2007-07-10 13:28:10.000000000 +0100
+@@ -8,7 +8,7 @@ all: table
+ 
+ 
+ table: table.o clutter-dominatrix.o clutter-video-player.o
+-	$(CC) -g -Wall $(CFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
++	$(CC) -g -Wall $(CFLAGS) $(LDFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS)
+ 
+ clean:
+ 	rm -fr *.o table
+\ No newline at end of file
diff --git a/packages/clutter/table_svn.bb b/packages/clutter/table_svn.bb
new file mode 100644
index 0000000000..168ea4dfba
--- /dev/null
+++ b/packages/clutter/table_svn.bb
@@ -0,0 +1,10 @@
+require table.inc
+
+PV = "0.3.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=table;proto=http \
+           file://fixes.patch;patch=1"
+
+S = "${WORKDIR}/table"
+
+
diff --git a/packages/clutter/tidy.inc b/packages/clutter/tidy.inc
new file mode 100644
index 0000000000..bac910a4f4
--- /dev/null
+++ b/packages/clutter/tidy.inc
@@ -0,0 +1,24 @@
+DESCRIPTION = "Tidy library"
+HOMEPAGE = "http://www.clutter-project.org/"
+LICENSE = "LGPL"
+
+STDDEPENDS = "clutter"
+BASE_CONF = "--disable-gtk-doc"
+
+DEPENDS = "${STDDEPENDS}"
+EXTRA_OECONF = "${BASE_CONF}"
+
+inherit autotools pkgconfig
+
+PACKAGES =+ "tidy-examples"
+FILES_tidy-examples = "${bindir}/test-*"
+
+do_configure_prepend() {
+        touch ${S}/gtk-doc.make
+        sed -i s:docs/reference/Makefile::g ${S}/configure.ac
+        sed -i s:docs::g ${S}/Makefile.am
+}
+
+do_stage () {
+        autotools_stage_all
+}
diff --git a/packages/clutter/tidy/.mtn2git_empty b/packages/clutter/tidy/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/clutter/tidy/.mtn2git_empty
diff --git a/packages/clutter/tidy/autofoo.patch b/packages/clutter/tidy/autofoo.patch
new file mode 100644
index 0000000000..7f54a3372a
--- /dev/null
+++ b/packages/clutter/tidy/autofoo.patch
@@ -0,0 +1,11 @@
+Index: tidy/doc/reference/Makefile.am
+===================================================================
+--- tidy.orig/doc/reference/Makefile.am  2007-11-06 19:36:56.000000000 +0000
++++ tidy/doc/reference/Makefile.am       2007-11-06 19:37:02.000000000 +0000
+@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make
+ 
+ # Other files to distribute
+ # e.g. EXTRA_DIST += version.xml.in
+-EXTRA_DIST += version.xml.in
++EXTRA_DIST = version.xml.in
+
diff --git a/packages/clutter/tidy/tidy-enable-tests.patch b/packages/clutter/tidy/tidy-enable-tests.patch
new file mode 100644
index 0000000000..c5e1660c54
--- /dev/null
+++ b/packages/clutter/tidy/tidy-enable-tests.patch
@@ -0,0 +1,20 @@
+Index: trunk/tests/Makefile.am
+===================================================================
+--- trunk.orig/tests/Makefile.am	2008-03-04 12:22:10.000000000 +0000
++++ trunk/tests/Makefile.am	2008-03-04 12:23:46.000000000 +0000
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = \
++bin_PROGRAMS = \
+ 	test-button \
+ 	test-finger-scroll \
+ 	test-list-view \
+@@ -14,6 +14,9 @@
+ 	test-grow \
+ 	test-viewport
+ 
++test_texture_framedir = $(pkgdatadir)
++test_texture_frame_DATA = frame.png
++
+ INCLUDES = -I$(top_srcdir)
+ LDADD = $(top_builddir)/tidy/libtidy-1.0.la
+ 
diff --git a/packages/clutter/tidy_svn.bb b/packages/clutter/tidy_svn.bb
new file mode 100644
index 0000000000..348bba0a8e
--- /dev/null
+++ b/packages/clutter/tidy_svn.bb
@@ -0,0 +1,10 @@
+require tidy.inc
+
+PV = "0.1.0+svnr${SRCREV}"
+PR = "6"
+
+SRC_URI = "svn://svn.o-hand.com/repos/tidy;module=trunk;proto=http \
+           file://tidy-enable-tests.patch;patch=1"
+
+S = "${WORKDIR}/trunk"
+
diff --git a/packages/hal/ohm/.mtn2git_empty b/packages/hal/ohm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hal/ohm/.mtn2git_empty
diff --git a/packages/hal/ohm/fix_configure.patch b/packages/hal/ohm/fix_configure.patch
new file mode 100644
index 0000000000..e4b774e785
--- /dev/null
+++ b/packages/hal/ohm/fix_configure.patch
@@ -0,0 +1,39 @@
+Index: git/configure.in
+===================================================================
+--- git.orig/configure.in	2007-12-19 13:43:52.000000000 +0000
++++ git/configure.in	2008-03-06 23:59:57.000000000 +0000
+@@ -201,9 +201,6 @@
+ # Like AC_CHECK_HEADER, but it uses the already-computed -I directories.
+ AC_DEFUN(AC_CHECK_X_HEADER, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_CHECK_HEADER([$1],[$2],[$3],[$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -211,9 +208,6 @@
+ # Like AC_TRY_COMPILE, but it uses the already-computed -I directories.
+ AC_DEFUN(AC_TRY_X_COMPILE, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -224,14 +218,8 @@
+   ac_save_CPPFLAGS="$CPPFLAGS"
+   ac_save_LDFLAGS="$LDFLAGS"
+ #  ac_save_LIBS="$LIBS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   # note: $X_CFLAGS includes $x_includes
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+-  if test \! -z "$libdir" ; then
+-    LDFLAGS="$LDFLAGS -L$libdir"
+-  fi
+   # note: $X_LIBS includes $x_libraries
+   LDFLAGS="$LDFLAGS $ALL_X_LIBS"
+   AC_CHECK_LIB([$1], [$2], [$3], [$4], [$5])
diff --git a/packages/hal/ohm_git.bb b/packages/hal/ohm_git.bb
index 11fbd1c929..a747c2ff1c 100644
--- a/packages/hal/ohm_git.bb
+++ b/packages/hal/ohm_git.bb
@@ -4,44 +4,41 @@ LICENSE = "LGPL"
 
 DEPENDS = "gtk+ dbus-glib intltool-native hal"
 RDEPENDS_${PN} += "udev hal-info"
-SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git"
+SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \
+           file://fix_configure.patch;patch=1"
 
-PV = "0.0+git${SRCDATE}"
-PR = "r2"
+SRCREV = "edfe25d49d67884bf004de7ae0724c162bb5e65e"
+PV = "0.1.2+${PR}+git${SRCREV}"
 
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = "--with-distro=debian --without-xauth"
+EXTRA_OECONF = "--with-distro=debian \
+        --without-xauth \
+        --disable-gtk-doc \
+        --disable-docbook-docs"
 
 do_configure_prepend() {
         touch gtk-doc.make
 }
 
-do_configure_append() {
-        rm config.log
-}
-
 OE_LT_RPATH_ALLOW=":${libdir}/libohm:"
 OE_LT_RPATH_ALLOW[export]="1"
 
 PACKAGES =+ "libohm ohm-plugin-x11"
 
-FILES_${PN}-dev += "${libdir}/ohm/*.la \
-                   ${libdir}/ohm/*.a "
+FILES_${PN}-dev += "${libdir}/ohm/*.a"
 
 FILES_${PN} = "${sysconfdir} \
                ${bindir}/* \
-	       ${sbindir}/* \
-	       ${libdir}/ohm/*.so \
-	       "
+               ${sbindir}/* \
+               ${libdir}/ohm/*.so \
+               "
 
 FILES_libohm = "${libdir}/libohm.so.*"
 FILES_ohm-plugin-x11 = "${libdir}/ohm/libohm_x*.so \
                         ${libdir}/ohm/libohm_idle.so \ 
                         ${sysconfdir}/ohm/plugins.d/x* \
-			${sysconfdir}/ohm/plugins.d/idle* \
-			"
-
-
+                        ${sysconfdir}/ohm/plugins.d/idle* \
+                        "
diff --git a/packages/intltool/intltool-native_0.40.3.bb b/packages/intltool/intltool-native_0.40.3.bb
index ca1c5ef5c9..a90b667d6d 100644
--- a/packages/intltool/intltool-native_0.40.3.bb
+++ b/packages/intltool/intltool-native_0.40.3.bb
@@ -1,6 +1,6 @@
 require intltool_${PV}.bb
 
-PR = "r1"
+PR = "r2"
 
 inherit native
 DEPENDS = "libxml-parser-perl-native"
@@ -13,3 +13,8 @@ do_configure_prepend() {
 	 	sed -i -e s:-w::g $i 
 	done	
 }
+
+do_configure_append() {
+        sed -i -e s:head\ -1:head\ -n1:g intltool.m4
+}
+	
diff --git a/packages/loudmouth/loudmouth_1.3.2.bb b/packages/loudmouth/loudmouth_1.3.2.bb
new file mode 100644
index 0000000000..d8f519b611
--- /dev/null
+++ b/packages/loudmouth/loudmouth_1.3.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol."
+HOMEPAGE = "http://www.loudmouth-project.org/"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 gnutls check"
+
+SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/packages/sugar/sugar-base_0.82.0.bb b/packages/sugar/sugar-base_0.82.0.bb
index d7379381b4..69c3cab21d 100644
--- a/packages/sugar/sugar-base_0.82.0.bb
+++ b/packages/sugar/sugar-base_0.82.0.bb
@@ -1,10 +1,12 @@
 DESCRIPTION = "Sugar base system"
 LICENSE = "LGPLv2"
 
-PR = "r5"
+PR = "r8"
 
 DEPENDS = "python-pygtk sugar-toolkit"
-RDEPENDS = "hippo-canvas \
+RDEPENDS = "librsvg-gtk \
+            ohm-plugin-x11 ohm \
+	    hippo-canvas \
             python-datetime \
             python-netclient \
 	    python-pygtk \
@@ -12,7 +14,8 @@ RDEPENDS = "hippo-canvas \
 	    python-logging \
 	    python-dbus \
 	    python-subprocess \
-	    telepathy-python \
+	    telepathy-gabble telepathy-salut telepathy-python \
+	    sugar-presence-service \
 	    python-crypt \
 	    python-numpy \
 	    python-compression \
diff --git a/packages/sugar/sugar-presence-service_0.82.1.bb b/packages/sugar/sugar-presence-service_0.82.1.bb
new file mode 100644
index 0000000000..67b96f7b20
--- /dev/null
+++ b/packages/sugar/sugar-presence-service_0.82.1.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Sugar presence service"
+LICENSE = "GPLv2"
+
+DEPENDS = "sugar-toolkit"
+
+SRC_URI = "http://dev.laptop.org/pub/sugar/sources/${PN}/${PN}-${PV}.tar.bz2"
+
+inherit autotools distutils-base
+
+do_configure_prepend() {
+	mkdir -p ${S}/m4
+}	
+
+FILES_${PN} += "${datadir}/${PN} \
+                ${datadir}/mime \
+		${datadir}/xsessions \
+		${datadir}/dbus-1 \
+		${sysconfdir} \
+		${libdir}/python*/site-packages/"
+
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug"
+
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/packages/telepathy/empathy_2.23.90.bb b/packages/telepathy/empathy_2.23.90.bb
new file mode 100644
index 0000000000..18e95b1430
--- /dev/null
+++ b/packages/telepathy/empathy_2.23.90.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Empathy: a Telepathy based IM client"
+HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
+LICENSE = "GPL"
+DEPENDS = "python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"
+RDEPENDS = "telepathy-mission-control"
+RRECOMMENDS = "telepathy-gabble"
+
+inherit gnome
+
+PARALLEL_MAKE = ""
+
+FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
+        ${datadir}/dbus-1/services/*.service \
+        ${datadir}/telepathy/managers/*.chandler \
+	${datadir}/icons \
+	${libdir}/python*"
+
+FILES_${PN}-dbg += "${libdir}/python*/*/.debug"
+
diff --git a/packages/telepathy/libtelepathy_0.3.3.bb b/packages/telepathy/libtelepathy_0.3.3.bb
new file mode 100644
index 0000000000..d30b301d38
--- /dev/null
+++ b/packages/telepathy/libtelepathy_0.3.3.bb
@@ -0,0 +1,15 @@
+HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
+DEPENDS = "glib-2.0 dbus"
+LICENSE = "LGPL"
+PR = "r0"
+
+SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}/telepathy \
+		${datadir}/dbus-1"
+
+do_stage() {
+    autotools_stage_all
+}
diff --git a/packages/telepathy/telepathy-gabble-0.7.8/.mtn2git_empty b/packages/telepathy/telepathy-gabble-0.7.8/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/telepathy/telepathy-gabble-0.7.8/.mtn2git_empty
diff --git a/packages/telepathy/telepathy-gabble-0.7.8/gabble.manager b/packages/telepathy/telepathy-gabble-0.7.8/gabble.manager
new file mode 100644
index 0000000000..d09b838090
--- /dev/null
+++ b/packages/telepathy/telepathy-gabble-0.7.8/gabble.manager
@@ -0,0 +1,32 @@
+
+[ConnectionManager]
+BusName=org.freedesktop.Telepathy.ConnectionManager.gabble
+ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/gabble
+
+[Protocol jabber]
+param-account=s required register
+param-password=s required register
+param-server=s
+param-resource=s
+param-priority=n
+param-port=q
+param-old-ssl=b
+param-require-encryption=b
+param-register=b
+param-low-bandwidth=b
+param-https-proxy-server=s
+param-https-proxy-port=q
+param-fallback-conference-server=s
+param-stun-server=s
+param-stun-port=q
+param-ignore-ssl-errors=b
+param-alias=s
+default-resource=Telepathy
+default-priority=0
+default-old-ssl=false
+default-require-encryption=false
+default-register=false
+default-low-bandwidth=false
+default-https-proxy-port=443
+default-stun-port=3478
+default-ignore-ssl-errors=false
diff --git a/packages/telepathy/telepathy-gabble_0.7.8.bb b/packages/telepathy/telepathy-gabble_0.7.8.bb
new file mode 100644
index 0000000000..fbc209eeb5
--- /dev/null
+++ b/packages/telepathy/telepathy-gabble_0.7.8.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Gabble: a Jabber/XMPP connection manager"
+HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
+DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib"
+LICENSE = "LGPL"
+
+# gabble.manager needs to get regenerated every release, so please don't copy it over blindly
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${P}.tar.gz \
+           file://gabble.manager"
+
+inherit autotools pkgconfig
+
+do_compile_prepend() {
+      cp ${WORKDIR}/gabble.manager ${S}/data/
+}
+
+FILES_${PN} += "${datadir}/telepathy \
+		${datadir}/dbus-1"
diff --git a/packages/telepathy/telepathy-glib_0.7.14.bb b/packages/telepathy/telepathy-glib_0.7.14.bb
new file mode 100644
index 0000000000..f6b6a6c6b3
--- /dev/null
+++ b/packages/telepathy/telepathy-glib_0.7.14.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "Telepathy framework - GLib library"
+HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
+DEPENDS = "glib-2.0 dbus python-native dbus-native"
+LICENSE = "LGPL"
+
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz "
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${datadir}/telepathy \
+		${datadir}/dbus-1"
+
+do_stage() {
+	#
+	# copied autotools_stage_all because telepathy-glib has one lib only built as static
+	# so it can not be oe_libinstalled
+	#
+	rm -rf ${STAGE_TEMP}
+	mkdir -p ${STAGE_TEMP}
+	oe_runmake DESTDIR="${STAGE_TEMP}" install
+	if [ -d ${STAGE_TEMP}/${includedir} ]; then
+		cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}
+	fi
+	if [ -d ${STAGE_TEMP}/${libdir} ]
+	then
+		for i in ${STAGE_TEMP}/${libdir}/*.la
+		do
+			if [ ! -f "$i" ]; then
+				cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
+				break
+			fi
+		done
+		oe_libinstall -so -C telepathy-glib/.libs libtelepathy-glib ${STAGING_LIBDIR}
+	fi
+	if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
+		install -d ${STAGING_DATADIR}/aclocal
+		cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
+	fi
+	rm -rf ${STAGE_TEMP}
+}
diff --git a/packages/telepathy/telepathy-mission-control_4.67.bb b/packages/telepathy/telepathy-mission-control_4.67.bb
new file mode 100644
index 0000000000..418a265512
--- /dev/null
+++ b/packages/telepathy/telepathy-mission-control_4.67.bb
@@ -0,0 +1,52 @@
+DESCRIPTION = "Telepathy Mission Control"
+HOMEPAGE = "http://mission-control.sourceforge.net/"
+LICENSE = "LGPL"
+SECTION = "libs"
+DEPENDS = "libtelepathy dbus-glib gconf"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/mission-control/telepathy-mission-control-${PV}.tar.gz"
+
+inherit autotools 
+
+PACKAGES =+ " \
+	libmissioncontrol \
+	libmissioncontrol-config \
+	libmissioncontrol-server \
+	libmissioncontrol-dev \
+	libmissioncontrol-config-dev \
+	libmissioncontrol-server-dev \
+	libmissioncontrol-dbg \
+	libmissioncontrol-config-dbg \
+	libmissioncontrol-server-dbg \
+"
+
+FILES_${PN} += "${datadir}/dbus*"
+
+FILES_libmissioncontrol = "${libdir}/libmissioncontrol.so.*"
+FILES_libmissioncontrol-config = "${libdir}/libmissioncontrol-config.so.*"
+FILES_libmissioncontrol-server = "${libdir}/libmissioncontrol-server.so.*"
+
+FILES_libmissioncontrol-dev = "${libdir}/libmissioncontrol.* \
+                               ${includedir}/libmissioncontrol/ \
+                	       ${libdir}/pkgconfig/libmissioncontrol.pc"
+FILES_libmissioncontrol-config-dev = "${libdir}/libmissioncontrol-config.*"
+FILES_libmissioncontrol-server-dev = "${libdir}/libmissioncontrol-server.*"
+
+FILES_libmissioncontrol-dbg += "${libdir}/.debug/libmissioncontrol.so.*"
+FILES_libmissioncontrol-config-dbg += "${libdir}/.debug/libmissioncontrol-config.so.*"
+FILES_libmissioncontrol-server-dbg += "${libdir}/.debug/libmissioncontrol-server.so.*"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_compile_append() {
+        for i in ${S}/*.pc ; do
+            sed -i -e s:${STAGING_DIR_TARGET}::g \
+                   -e s:/${TARGET_SYS}::g \
+                      $i
+        done
+}
+
+do_stage() {
+        autotools_stage_all
+}
diff --git a/packages/telepathy/telepathy-python_0.15.1.bb b/packages/telepathy/telepathy-python_0.15.1.bb
new file mode 100644
index 0000000000..0898b321eb
--- /dev/null
+++ b/packages/telepathy/telepathy-python_0.15.1.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Telepathy framework - Python package"
+HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
+LICENSE = "LGPL"
+RDEPENDS_${PN} += "python-dbus"
+
+SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz "
+
+inherit distutils
diff --git a/packages/telepathy/telepathy-salut-0.3.4/.mtn2git_empty b/packages/telepathy/telepathy-salut-0.3.4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/telepathy/telepathy-salut-0.3.4/.mtn2git_empty
diff --git a/packages/telepathy/telepathy-salut-0.3.4/keep-manager-file.diff b/packages/telepathy/telepathy-salut-0.3.4/keep-manager-file.diff
new file mode 100644
index 0000000000..4c335e0c8b
--- /dev/null
+++ b/packages/telepathy/telepathy-salut-0.3.4/keep-manager-file.diff
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.am	2008-08-31 15:37:45.000000000 +0200
++++ telepathy-salut-0.3.4/data/Makefile.am	2008-08-31 15:38:09.163198000 +0200
+@@ -15,8 +15,4 @@
+ 
+ CLEANFILES = $(service_DATA) $(manager_DATA)
+ 
+-$(manager_DATA): always-build
+-	$(MAKE) -C ../src write-mgr-file
+-	../src/write-mgr-file > $@
+-
+ .PHONY: always-build
diff --git a/packages/telepathy/telepathy-salut-0.3.4/salut.manager b/packages/telepathy/telepathy-salut-0.3.4/salut.manager
new file mode 100644
index 0000000000..8fd84d5877
--- /dev/null
+++ b/packages/telepathy/telepathy-salut-0.3.4/salut.manager
@@ -0,0 +1,13 @@
+
+[ConnectionManager]
+Name=Salut
+BusName=org.freedesktop.Telepathy.ConnectionManager.salut
+ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/salut
+
+[Protocol local-xmpp]
+param-nickname=s
+param-first-name=s required
+param-last-name=s required
+param-jid=s
+param-email=s
+param-published-name=s
diff --git a/packages/telepathy/telepathy-salut_0.3.4.bb b/packages/telepathy/telepathy-salut_0.3.4.bb
new file mode 100644
index 0000000000..c8b9edaee1
--- /dev/null
+++ b/packages/telepathy/telepathy-salut_0.3.4.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Salut: Link-local XMPP connection manager for the Telepathy framework"
+HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
+DEPENDS = "telepathy-glib avahi telepathy-gabble"
+LICENSE = "LGPL"
+
+#salut.manager changes every release, don't copy it over blindly!
+SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz \
+           file://keep-manager-file.diff;patch=1 \
+	   file://salut.manager"
+
+inherit autotools pkgconfig
+
+do_compile_prepend() {
+      cp ${WORKDIR}/salut.manager ${S}/data/
+}
+
+FILES_${PN} += "${datadir}/telepathy \
+		${datadir}/dbus-1"
diff --git a/packages/xorg-lib/pixman/pixman-arm.patch b/packages/xorg-lib/pixman/pixman-arm.patch
index 224b612548..6520a52d68 100644
--- a/packages/xorg-lib/pixman/pixman-arm.patch
+++ b/packages/xorg-lib/pixman/pixman-arm.patch
@@ -1,76 +1,97 @@
-commit 23a7d5dea599efec1f459bac64cf9edc4bd5ae11
-Author: Ilpo Ruotsalainen <ilpo.ruotsalainen@movial.fi>
-Date:   Thu Nov 29 12:29:59 2007 +0000
+commit 44d4231272bdf08fac077cdcaeaac1aec0dd1500
+Author: Jeff Muizelaar <jmuizelaar@mozilla.com>
+Date:   Thu Aug 28 13:02:17 2008 -0400
 
-    Implement ARM optimized version of fill routines.
+    arm-simd
 
 diff --git a/configure.ac b/configure.ac
-index 22a91ef..3ac2a40 100644
+index 702bed0..7f24db5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -148,6 +148,32 @@ fi
- AM_CONDITIONAL(USE_SSE, test $have_sse_intrinsics = yes)
+@@ -301,6 +301,44 @@ AC_SUBST(VMX_CFLAGS)
  
- dnl ========================================================
-+
-+dnl Test for architechture specific optimizations for this platform
+ AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes)
+ 
++dnl Check for ARM
 +
-+AC_MSG_CHECKING(for architechture specific optimizations)
++have_armv5_simd=no
++AC_MSG_CHECKING(whether to use ARM assembler)
++xserver_save_CFLAGS=$CFLAGS
++CFLAGS="$CFLAGS $ARM_CFLAGS"
++AC_COMPILE_IFELSE([
++int main () {
++    asm("uqadd8 r1, r1, r2");
++    return 0;
++}], have_armv5_simd=yes)
++CFLAGS=$xserver_save_CFLAGS
 +
-+use_arch_opts=no
++AC_ARG_ENABLE(arm,
++   [AC_HELP_STRING([--disable-arm],
++                   [disable ARM fast paths])],
++   [enable_arm=$enableval], [enable_arm=auto])
 +
-+case "$host_cpu" in
-+arm)
-+	if test "$GCC" = "yes" ; then
-+		use_arch_opts=yes
-+		ARCH_OPT_SOURCES='pixman-arch-arm.lo'
-+	fi
-+	;;
-+esac
++if test $enable_arm = no ; then
++   have_armv5_simd=disabled
++fi
 +
-+AC_MSG_RESULT($use_arch_opts)
++if test $have_armv5_simd = yes ; then
++   AC_DEFINE(USE_ARM, 1, [use ARM compiler intrinsics])
++else
++   ARM_CFLAGS=
++fi
 +
-+if test $use_arch_opts = yes ; then
-+	AC_DEFINE(USE_ARCH_OPTS, 1, [use architechture specific optimizations])
++AC_MSG_RESULT($have_armv5_simd)
++if test $enable_arm = yes && test $have_armv5_simd = no ; then
++   AC_MSG_ERROR([ARM intrinsics not detected])
 +fi
 +
-+AC_SUBST([ARCH_OPT_SOURCES])
-+AM_CONDITIONAL(USE_ARCH_OPTS, test $use_arch_opts = yes)
++AC_SUBST(ARM_CFLAGS)
 +
-+dnl ========================================================
- AC_SUBST(MMX_CFLAGS)
- 
- PKG_CHECK_MODULES(GTK, [gtk+-2.0], [HAVE_GTK=yes], [HAVE_GTK=no])
++AM_CONDITIONAL(USE_ARM, test $have_armv5_simd = yes)
++
++
+ AC_ARG_ENABLE(gtk,
+    [AC_HELP_STRING([--enable-gtk],
+                    [enable tests using GTK+ [default=auto]])],
 diff --git a/pixman/Makefile.am b/pixman/Makefile.am
-index 66283a2..dab6363 100644
+index 4f046f1..2cad71a 100644
 --- a/pixman/Makefile.am
 +++ b/pixman/Makefile.am
-@@ -20,6 +20,11 @@ libpixman_1_la_SOURCES =		\
- libpixmanincludedir = $(includedir)/pixman-1/
- libpixmaninclude_HEADERS = pixman.h
+@@ -77,3 +77,16 @@ libpixman_sse_la_LIBADD = $(DEP_LIBS)
+ libpixman_1_la_LIBADD += libpixman-sse.la
+ endif
  
-+if USE_ARCH_OPTS
-+libpixman_1_la_LIBADD += $(ARCH_OPT_SOURCES)
-+libpixman_1_la_DEPENDENCIES = $(ARCH_OPT_SOURCES)
++# arm code
++if USE_ARM
++noinst_LTLIBRARIES += libpixman-arm.la
++libpixman_arm_la_SOURCES = \
++	pixman-arm.c \
++	pixman-arm.h \
++	pixman-combine32.h
++libpixman_arm_la_CFLAGS = $(DEP_CFLAGS) $(ARM_CFLAGS)
++libpixman_arm_la_LIBADD = $(DEP_LIBS)
++libpixman_1_la_LIBADD += libpixman-arm.la
 +endif
 +
- # mmx code
- if USE_MMX
- noinst_LTLIBRARIES = libpixman-mmx.la
-diff --git a/pixman/pixman-arch-arm.c b/pixman/pixman-arch-arm.c
++
+diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c
 new file mode 100644
-index 0000000..655092c
+index 0000000..9750730
 --- /dev/null
-+++ b/pixman/pixman-arch-arm.c
-@@ -0,0 +1,205 @@
++++ b/pixman/pixman-arm.c
+@@ -0,0 +1,312 @@
 +/*
-+ * Copyright © 2007 Movial Creative Technologies Inc
++ * Copyright © 2008 Mozilla Corporation
 + *
 + * Permission to use, copy, modify, distribute, and sell this software and its
 + * documentation for any purpose is hereby granted without fee, provided that
 + * the above copyright notice appear in all copies and that both that
 + * copyright notice and this permission notice appear in supporting
-+ * documentation.
++ * documentation, and that the name of Mozilla Corporation not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  Mozilla Corporation makes no
++ * representations about the suitability of this software for any purpose.  It
++ * is provided "as is" without express or implied warranty.
 + *
 + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
 + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -81,230 +102,423 @@ index 0000000..655092c
 + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 + * SOFTWARE.
 + *
-+ * Author: Ilpo Ruotsalainen <ilpo.ruotsalainen@movial.fi>
++ * Author:  Jeff Muizelaar (jeff@infidigm.net)
++ *
 + */
-+
 +#ifdef HAVE_CONFIG_H
 +#include <config.h>
 +#endif
 +
-+#include "pixman.h"
-+#include "pixman-private.h"
++#include "pixman-arm.h"
++#include "pixman-combine32.h"
 +
-+static void
-+pixman_fill8 (uint32_t  *bits,
-+	      int	stride,
-+	      int	x,
-+	      int	y,
-+	      int	width,
-+	      int	height,
-+	      uint32_t  xor)
++void
++fbCompositeSrcAdd_8000x8000arm (pixman_op_t op,
++				pixman_image_t * pSrc,
++				pixman_image_t * pMask,
++				pixman_image_t * pDst,
++				int16_t      xSrc,
++				int16_t      ySrc,
++				int16_t      xMask,
++				int16_t      yMask,
++				int16_t      xDst,
++				int16_t      yDst,
++				uint16_t     width,
++				uint16_t     height)
 +{
-+    int byte_stride = stride * sizeof (uint32_t);
-+    uint8_t *dst = (uint8_t *) bits;
-+    uint8_t v = xor & 0xff;
-+
-+    xor = v | (v << 8);
-+    xor |= xor << 16;
++    uint8_t	*dstLine, *dst;
++    uint8_t	*srcLine, *src;
++    int	dstStride, srcStride;
++    uint16_t	w;
++    uint8_t	s, d;
++    uint16_t	t;
 +
-+    dst = dst + y * byte_stride + x;
++    fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1);
++    fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1);
 +
 +    while (height--)
 +    {
-+	uint32_t dummy1, dummy2;
-+
-+	asm volatile(
-+	    /* Check if the fill width is very small */
-+	    "	cmp	%0, #8\n"
-+	    "	bcc	2f\n"
-+	    /* Output single pixels until aligned to word boundary */
-+	    "1:	tst	%1, #3\n"
-+	    "	strneb	%4, [%1], #1\n"
-+	    "	subne	%0, %0, #1\n"
-+	    "	bne	1b\n"
-+	    /* Output up to 16 pixels per iteration */
-+	    "1:	subs	%0, %0, #8\n"
-+	    "	strcs	%4, [%1], #4\n"
-+	    "	strcs	%4, [%1], #4\n"
-+	    "	subcss	%0, %0, #8\n"
-+	    "	strcs	%4, [%1], #4\n"
-+	    "	strcs	%4, [%1], #4\n"
-+	    "	bcs	1b\n"
-+	    /* Finish up any remaining pixels */
-+	    "	and	%0, %0, #7\n"
-+	    "2:	subs	%0, %0, #1\n"
-+	    "	strcsb	%4, [%1], #1\n"
-+	    "	subcss	%0, %0, #1\n"
-+	    "	strcsb	%4, [%1], #1\n"
-+	    "	bcs	2b\n"
-+	    : "=r" (dummy1), "=r" (dummy2)
-+	    : "0" (width), "1" (dst), "r" (xor)
-+	    : "cc", "memory"
-+	    );
-+
-+	dst += byte_stride;
-+    }
-+}
++	dst = dstLine;
++	dstLine += dstStride;
++	src = srcLine;
++	srcLine += srcStride;
++	w = width;
 +
-+static void
-+pixman_fill16 (uint32_t *bits,
-+	       int       stride,
-+	       int       x,
-+	       int       y,
-+	       int       width,
-+	       int       height,
-+	       uint32_t  xor)
-+{
-+    int short_stride = (stride * sizeof (uint32_t)) / sizeof (uint16_t);
-+    uint16_t *dst = (uint16_t *)bits;
-+    uint16_t v = xor & 0xffff;
++	while (w && (unsigned long)dst & 3)
++	{
++	    s = *src;
++	    d = *dst;
++	    t = d + s;
++	    /* s = t | (0 - (t >> 8)); */
++	    asm("usat %0, #8, %1" : "=r"(s) : "r"(t));
++	    *dst = s;
 +
-+    xor = v | v << 16;
++	    dst++;
++	    src++;
++	    w--;
++	}
 +
-+    dst = dst + y * short_stride + x;
++	while (w >= 4)
++	{
++	    asm("uqadd8 %0, %1, %2" : "=r"(*(uint32_t*)dst) : "r"(*(uint32_t*)src), "r"(*(uint32_t*)dst));
++	    dst += 4;
++	    src += 4;
++	    w -= 4;
++	}
 +
-+    while (height--)
-+    {
-+	uint32_t dummy1, dummy2;
-+
-+	asm volatile(
-+	    /* Check if the fill width is very small */
-+	    "	cmp	%0, #4\n"
-+	    "	bcc	2f\n"
-+	    /* Output single pixels until aligned to word boundary */
-+	    "1:	tst	%1, #2\n"
-+	    "	strneh	%4, [%1], #2\n"
-+	    "	subne	%0, %0, #1\n"
-+	    "	bne	1b\n"
-+	    /* Output up to 8 pixels per iteration */
-+	    "1:	subs	%0, %0, #4\n"
-+	    "	strcs	%4, [%1], #4\n"
-+	    "	strcs	%4, [%1], #4\n"
-+	    "	subcss	%0, %0, #4\n"
-+	    "	strcs	%4, [%1], #4\n"
-+	    "	strcs	%4, [%1], #4\n"
-+	    "	bcs	1b\n"
-+	    /* Finish up any remaining pixels */
-+	    "	and	%0, %0, #3\n"
-+	    "2:	subs	%0, %0, #1\n"
-+	    "	strcsh	%4, [%1], #2\n"
-+	    "	bcs	2b\n"
-+	    : "=r" (dummy1), "=r" (dummy2)
-+	    : "0" (width), "1" (dst), "r" (xor)
-+	    : "cc", "memory"
-+	    );
-+
-+	dst += short_stride;
++	while (w)
++	{
++	    s = *src;
++	    d = *dst;
++	    t = d + s;
++	    /* s = t | (0 - (t >> 8)); */
++	    asm("usat %0, #8, %1" : "=r"(s) : "r"(t));
++	    *dst = s;
++
++	    dst++;
++	    src++;
++	    w--;
++	}
 +    }
++
 +}
 +
-+static void
-+pixman_fill32 (uint32_t *bits,
-+	       int       stride,
-+	       int       x,
-+	       int       y,
-+	       int       width,
-+	       int       height,
-+	       uint32_t  xor)
++void
++fbCompositeSrc_8888x8888arm (pixman_op_t op,
++			 pixman_image_t * pSrc,
++			 pixman_image_t * pMask,
++			 pixman_image_t * pDst,
++			 int16_t      xSrc,
++			 int16_t      ySrc,
++			 int16_t      xMask,
++			 int16_t      yMask,
++			 int16_t      xDst,
++			 int16_t      yDst,
++			 uint16_t     width,
++			 uint16_t     height)
 +{
-+    bits = bits + y * stride + x;
-+    
++    uint32_t	*dstLine, *dst;
++    uint32_t	*srcLine, *src;
++    int	dstStride, srcStride;
++    uint16_t	w;
++    uint32_t component_mask = 0xff00ff;
++    uint32_t component_half = 0x800080;
++
++    fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++    fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++
 +    while (height--)
 +    {
-+	uint32_t dummy1, dummy2;
-+
-+	asm volatile(
-+	    /* Check if the fill width is very small */
-+	    "	cmp	%0, #2\n"
-+	    "	bcc	2f\n"
-+	    /* Output up to 4 pixels per iteration */
-+	    "1:	subs	%0, %0, #2\n"
-+	    "	strcs	%4, [%1], #4\n"
-+	    "	strcs	%4, [%1], #4\n"
-+	    "	subcss	%0, %0, #2\n"
-+	    "	strcs	%4, [%1], #4\n"
-+	    "	strcs	%4, [%1], #4\n"
-+	    "	bcs	1b\n"
-+	    /* Output last pixel if necessary */
-+	    "2:	tst	%0, #1\n"
-+	    "	strne	%4, [%1], #4\n"
-+	    : "=r" (dummy1), "=r" (dummy2)
-+	    : "0" (width), "1" (bits), "r" (xor)
-+	    : "cc", "memory"
-+	    );
-+
-+	bits += stride;
++	dst = dstLine;
++	dstLine += dstStride;
++	src = srcLine;
++	srcLine += srcStride;
++	w = width;
++
++//#define inner_branch
++	asm volatile (
++			"cmp %[w], #0\n\t"
++			"beq 2f\n\t"
++			"1:\n\t"
++			/* load dest */
++			"ldr r5, [%[src]], #4\n\t"
++#ifdef inner_branch
++			/* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
++			 * The 0x0 case also allows us to avoid doing an unecessary data
++			 * write which is more valuable so we only check for that */
++			"cmp r5, #0x1000000\n\t"
++			"blt 3f\n\t"
++
++			/* = 255 - alpha */
++			"mvn r8, r5\n\t"
++			"mov r8, r8, lsr #24\n\t"
++
++			"ldr r4, [%[dest]] \n\t"
++
++#else
++			"ldr r4, [%[dest]] \n\t"
++
++			/* = 255 - alpha */
++			"mvn r8, r5\n\t"
++			"mov r8, r8, lsr #24\n\t"
++#endif
++			"and r6, %[component_mask], r4\n\t"
++			"and r7, %[component_mask], r4, lsr #8\n\t"
++
++			/* multiply by 257 and divide by 65536 */
++			"mla r6, r6, r8, %[component_half]\n\t"
++			"mla r7, r7, r8, %[component_half]\n\t"
++
++			"and r8, %[component_mask], r6, lsr #8\n\t"
++			"and r9, %[component_mask], r7, lsr #8\n\t"
++
++			"add r6, r6, r8\n\t"
++			"add r7, r7, r9\n\t"
++
++			"and r6, %[component_mask], r6, lsr #8\n\t"
++			"and r7, %[component_mask], r7, lsr #8\n\t"
++
++			/* recombine */
++			"orr r6, r6, r7, lsl #8\n\t"
++
++			"uqadd8 r5, r6, r5\n\t"
++
++#ifdef inner_branch
++			"3:\n\t"
++
++#endif
++			"str r5, [%[dest]], #4\n\t"
++			/* increment counter and jmp to top */
++			"subs	%[w], %[w], #1\n\t"
++			"bne	1b\n\t"
++			"2:\n\t"
++			: [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src)
++			: [component_half] "r" (component_half), [component_mask] "r" (component_mask)
++			: "r4", "r5", "r6", "r7", "r8", "r9", "cc", "memory"
++			);
 +    }
 +}
 +
-+pixman_bool_t
-+pixman_fill (uint32_t *bits,
-+	     int stride,
-+	     int bpp,
-+	     int x,
-+	     int y,
-+	     int width,
-+	     int height,
-+	     uint32_t xor)
++void
++fbCompositeSrc_8888x8x8888arm (pixman_op_t op,
++			       pixman_image_t * pSrc,
++			       pixman_image_t * pMask,
++			       pixman_image_t * pDst,
++			       int16_t	xSrc,
++			       int16_t	ySrc,
++			       int16_t      xMask,
++			       int16_t      yMask,
++			       int16_t      xDst,
++			       int16_t      yDst,
++			       uint16_t     width,
++			       uint16_t     height)
 +{
-+    switch (bpp)
++    uint32_t	*dstLine, *dst;
++    uint32_t	*srcLine, *src;
++    uint32_t	mask;
++    int	dstStride, srcStride;
++    uint16_t	w;
++    uint32_t component_mask = 0xff00ff;
++    uint32_t component_half = 0x800080;
++
++    fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1);
++    fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1);
++
++    fbComposeGetSolid (pMask, mask, pDst->bits.format);
++    mask = (mask) >> 24;
++
++    while (height--)
 +    {
-+    case 8:
-+	pixman_fill8 (bits, stride, x, y, width, height, xor);
-+	break;
-+	
-+    case 16:
-+	pixman_fill16 (bits, stride, x, y, width, height, xor);
-+	break;
-+	
-+    case 32:
-+	pixman_fill32 (bits, stride, x, y, width, height, xor);
-+	break;
-+
-+    default:
-+	return FALSE;
-+	break;
++	dst = dstLine;
++	dstLine += dstStride;
++	src = srcLine;
++	srcLine += srcStride;
++	w = width;
++
++//#define inner_branch
++	asm volatile (
++			"cmp %[w], #0\n\t"
++			"beq 2f\n\t"
++			"1:\n\t"
++			/* load dest */
++			"ldr r5, [%[src]], #4\n\t"
++#ifdef inner_branch
++			/* We can avoid doing the multiplication in two cases: 0x0 or 0xff.
++			 * The 0x0 case also allows us to avoid doing an unecessary data
++			 * write which is more valuable so we only check for that */
++			"cmp r5, #0x1000000\n\t"
++			"blt 3f\n\t"
++
++#endif
++			"ldr r4, [%[dest]] \n\t"
++
++			"and r6, %[component_mask], r5\n\t"
++			"and r7, %[component_mask], r5, lsr #8\n\t"
++
++			/* multiply by alpha (r8) then by 257 and divide by 65536 */
++			"mla r6, r6, %[mask_alpha], %[component_half]\n\t"
++			"mla r7, r7, %[mask_alpha], %[component_half]\n\t"
++
++			"and r8, %[component_mask], r6, lsr #8\n\t"
++			"and r9, %[component_mask], r7, lsr #8\n\t"
++
++			"add r6, r6, r8\n\t"
++			"add r7, r7, r9\n\t"
++
++			"and r6, %[component_mask], r6, lsr #8\n\t"
++			"and r7, %[component_mask], r7, lsr #8\n\t"
++
++			/* recombine */
++			"orr r5, r6, r7, lsl #8\n\t"
++
++			"and r6, %[component_mask], r4\n\t"
++			"and r7, %[component_mask], r4, lsr #8\n\t"
++
++			"mvn r8, r5\n\t"
++			"mov r8, r8, lsr #24\n\t"
++
++			/* multiply by alpha (r8) then by 257 and divide by 65536 */
++			"mla r6, r6, r8, %[component_half]\n\t"
++			"mla r7, r7, r8, %[component_half]\n\t"
++
++			"and r8, %[component_mask], r6, lsr #8\n\t"
++			"and r9, %[component_mask], r7, lsr #8\n\t"
++
++			"add r6, r6, r8\n\t"
++			"add r7, r7, r9\n\t"
++
++			"and r6, %[component_mask], r6, lsr #8\n\t"
++			"and r7, %[component_mask], r7, lsr #8\n\t"
++
++			/* recombine */
++			"orr r6, r6, r7, lsl #8\n\t"
++
++			"uqadd8 r5, r6, r5\n\t"
++
++#ifdef inner_branch
++			"3:\n\t"
++
++#endif
++			"str r5, [%[dest]], #4\n\t"
++			/* increment counter and jmp to top */
++			"subs	%[w], %[w], #1\n\t"
++			"bne	1b\n\t"
++			"2:\n\t"
++			: [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src)
++			: [component_half] "r" (component_half), [component_mask] "r" (component_mask), [mask_alpha] "r" (mask)
++			: "r4", "r5", "r6", "r7", "r8", "r9", "cc", "memory"
++			);
 +    }
-+	
-+    return TRUE;
 +}
-diff --git a/pixman/pixman-arch.h b/pixman/pixman-arch.h
++
++
+diff --git a/pixman/pixman-arm.h b/pixman/pixman-arm.h
 new file mode 100644
-index 0000000..1eee9d3
+index 0000000..06a3121
 --- /dev/null
-+++ b/pixman/pixman-arch.h
-@@ -0,0 +1,7 @@
-+#ifdef USE_ARCH_OPTS
++++ b/pixman/pixman-arm.h
+@@ -0,0 +1,80 @@
++/*
++ * Copyright © 2008 Mozilla Corporation
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of Mozilla Corporation not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  Mozilla Corporation makes no
++ * representations about the suitability of this software for any purpose.  It
++ * is provided "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++ * SOFTWARE.
++ *
++ * Author:  Jeff Muizelaar (jeff@infidigm.net)
++ *
++ */
 +
-+#ifdef __arm__
-+#define USE_ARCH_FILL
-+#endif
++#include "pixman-private.h"
++
++#ifdef USE_ARM
++
++static inline pixman_bool_t pixman_have_arm(void) { return TRUE; }
 +
++#else
++#define pixman_have_arm() FALSE
 +#endif
---- /tmp/pixman-utils.c	2008-08-14 12:38:44.000000000 +0200
-+++ pixman-0.11.8/pixman/pixman-utils.c	2008-08-14 12:40:03.503198000 +0200
-@@ -28,6 +28,7 @@
- #include <stdlib.h>
- 
- #include "pixman-private.h"
-+#include "pixman-arch.h"
++
++#ifdef USE_ARM
++
++void
++fbCompositeSrcAdd_8000x8000arm (pixman_op_t op,
++				pixman_image_t * pSrc,
++				pixman_image_t * pMask,
++				pixman_image_t * pDst,
++				int16_t      xSrc,
++				int16_t      ySrc,
++				int16_t      xMask,
++				int16_t      yMask,
++				int16_t      xDst,
++				int16_t      yDst,
++				uint16_t     width,
++				uint16_t     height);
++void
++fbCompositeSrc_8888x8888arm (pixman_op_t op,
++			 pixman_image_t * pSrc,
++			 pixman_image_t * pMask,
++			 pixman_image_t * pDst,
++			 int16_t      xSrc,
++			 int16_t      ySrc,
++			 int16_t      xMask,
++			 int16_t      yMask,
++			 int16_t      xDst,
++			 int16_t      yDst,
++			 uint16_t     width,
++			 uint16_t     height);
++
++void
++fbCompositeSrc_8888x8x8888arm (pixman_op_t op,
++			 pixman_image_t * pSrc,
++			 pixman_image_t * pMask,
++			 pixman_image_t * pDst,
++			 int16_t      xSrc,
++			 int16_t      ySrc,
++			 int16_t      xMask,
++			 int16_t      yMask,
++			 int16_t      xDst,
++			 int16_t      yDst,
++			 uint16_t     width,
++			 uint16_t     height);
++
++#endif /* USE_ARM */
+diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
+index b918219..05abc82 100644
+--- a/pixman/pixman-pict.c
++++ b/pixman/pixman-pict.c
+@@ -34,6 +34,7 @@
  #include "pixman-mmx.h"
+ #include "pixman-vmx.h"
+ #include "pixman-sse.h"
++#include "pixman-arm.h"
+ #include "pixman-combine32.h"
  
- PIXMAN_EXPORT pixman_bool_t
-@@ -84,6 +85,7 @@
- 	return FALSE;
- }
+ #ifdef __GNUC__
+@@ -1479,6 +1480,18 @@ static const FastPathInfo vmx_fast_paths[] =
+ };
+ #endif
  
-+#ifndef USE_ARCH_FILL
- static void
- pixman_fill8 (uint32_t  *bits,
- 	      int	stride,
-@@ -197,7 +199,7 @@
++#ifdef USE_ARM
++static const FastPathInfo arm_fast_paths[] =
++{
++    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null,     PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8888arm,      0 },
++    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8,       PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8x8888arm,    NEED_SOLID_MASK },
++    { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8,       PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8x8888arm,	   NEED_SOLID_MASK },
++
++    { PIXMAN_OP_ADD, PIXMAN_a8,        PIXMAN_null,     PIXMAN_a8,       fbCompositeSrcAdd_8000x8000arm,   0 },
++
++    { PIXMAN_OP_NONE },
++};
++#endif
  
-     return TRUE;
- }
--
+ static const FastPathInfo c_fast_paths[] =
+ {
+@@ -1829,6 +1842,12 @@ pixman_image_composite (pixman_op_t      op,
+ 	if (!info && pixman_have_vmx())
+ 	    info = get_fast_path (vmx_fast_paths, op, pSrc, pMask, pDst, pixbuf);
+ #endif
++#ifdef USE_ARM
++
++	if (!info && pixman_have_arm())
++	    info = get_fast_path (arm_fast_paths, op, pSrc, pMask, pDst, pixbuf);
 +#endif
++
+         if (!info)
+ 	    info = get_fast_path (c_fast_paths, op, pSrc, pMask, pDst, pixbuf);
  
- /*
-  * Compute the smallest value no less than y which is on a
diff --git a/packages/xorg-lib/pixman_0.11.8.bb b/packages/xorg-lib/pixman_0.11.8.bb
index a6cc53dabb..6a4ce74d8f 100644
--- a/packages/xorg-lib/pixman_0.11.8.bb
+++ b/packages/xorg-lib/pixman_0.11.8.bb
@@ -3,6 +3,8 @@ PRIORITY = "optional"
 DESCRIPTION = "Low-level pixel manipulation library."
 LICENSE = "X11"
 
+PR = "r2"
+
 SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \
            file://pixman-arm.patch;patch=1 \
 	  "
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
index 0b0f847dff..0a61cb2c7e 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb
index 0a61cb2c7e..c9f6e3d29b 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \