Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

72 files changed, 1138 insertions, 66 deletions

diff --git a/recipes/cairo/cairo-native_1.8.0.bb b/recipes/cairo/cairo-native_1.8.0.bb
index c575cdcce1..d58e16b61d 100644
--- a/recipes/cairo/cairo-native_1.8.0.bb
+++ b/recipes/cairo/cairo-native_1.8.0.bb
@@ -3,8 +3,7 @@ require cairo_1.8.0.bb
 
 inherit native
 
-DEPENDS += "glib-2.0-native libpng-native libpixman-native libx11-native fontconfig-native"
+DEPENDS += "glib-2.0-native libpng-native pixman-native libx11-native fontconfig-native"
 PROVIDES = "cairo-native"
 
-PR = "r0"
-
+PR = "r1"
diff --git a/recipes/cherokee/cherokee_0.99.24.bb b/recipes/cherokee/cherokee_0.99.24.bb
index b5d016006f..05349033b3 100644
--- a/recipes/cherokee/cherokee_0.99.24.bb
+++ b/recipes/cherokee/cherokee_0.99.24.bb
@@ -1,6 +1,8 @@
 require cherokee.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
+
+DEPENDS = "libpcre openssl mysql"
 
 SRC_URI = "http://www.cherokee-project.com/download/0.99/${PV}/cherokee-${PV}.tar.gz \
            file://cherokee.init "
@@ -9,4 +11,4 @@ CONFFILES_${PN} = " \
 ${sysconfdir}/cherokee/cherokee.conf \
 ${sysconfdir}/init.d/cherokee \
 "
-EXTRA_OECONF += "--with-mysql=${STAGING_INCDIR}/mysql"
+EXTRA_OECONF = "--enable-tls=openssl --disable-static --disable-nls --with-mysql=${STAGING_INCDIR}/mysql"
diff --git a/recipes/dri/libdrm_2.4.17.bb b/recipes/dri/libdrm_2.4.17.bb
new file mode 100644
index 0000000000..4f2af1ed73
--- /dev/null
+++ b/recipes/dri/libdrm_2.4.17.bb
@@ -0,0 +1,16 @@
+SECTION = "x11/base"
+DEPENDS = "libpthread-stubs"
+LICENSE = "MIT"
+SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2"
+PROVIDES = "drm"
+PR = "r1"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES =+ "${PN}-intel"
+
+FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*"
diff --git a/recipes/freesmartphone/mickeydbus2_git.bb b/recipes/freesmartphone/mickeydbus2_git.bb
new file mode 100644
index 0000000000..799cbe72c1
--- /dev/null
+++ b/recipes/freesmartphone/mickeydbus2_git.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Mickey's DBus introspection and calling Program rewritten in vala"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+HOMEPAGE = "http://www.freesmartphone.org"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+
+DEPENDS = "vala-native glib-2.0 dbus dbus-glib"
+
+PV = "2.0.0+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
+S = "${WORKDIR}/git/tools/mdbus2"
+
+inherit autotools
+
+
diff --git a/recipes/gdb/gdb.inc b/recipes/gdb/gdb.inc
index 77a9ca6a3e..a63fb6159b 100644
--- a/recipes/gdb/gdb.inc
+++ b/recipes/gdb/gdb.inc
@@ -10,6 +10,10 @@ FILES_gdbserver = "${bindir}/gdbserver"
 RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
 RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
 
+RRECOMMENDS_gdb_append_linux-uclibc = " uclibc-thread-db "
+RRECOMMENDS_gdb_append_linux-uclibceabi = " uclibc-thread-db "
+RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db "
+
 inherit gettext
 
 SRC_URI += "file://kill_arm_map_symbols.patch;patch=1 \
@@ -43,5 +47,3 @@ do_install () {
 	install -d ${D}${bindir}
 	install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
 }
-
-
diff --git a/recipes/gdb/gdbserver.inc b/recipes/gdb/gdbserver.inc
index b98058fe5d..f477c3aa9c 100644
--- a/recipes/gdb/gdbserver.inc
+++ b/recipes/gdb/gdbserver.inc
@@ -1,6 +1,6 @@
 require gdb-common.inc
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 DEFAULT_PREFERENCE_avr32 = "-99"
 
@@ -9,6 +9,10 @@ FILES_gdbserver = "${bindir}/gdbserver"
 RRECOMMENDS_gdb_append_linux = " glibc-thread-db "
 RRECOMMENDS_gdb_append_linux-gnueabi = " glibc-thread-db "
 
+RRECOMMENDS_gdb_append_linux-uclibc = " uclibc-thread-db "
+RRECOMMENDS_gdb_append_linux-uclibceabi = " uclibc-thread-db "
+RRECOMMENDS_gdb_append_linux-spe = " uclibc-thread-db "
+
 inherit gettext
 
 FILESPATHPKG =. "gdb-${PV}:"
diff --git a/recipes/glib-1.2/glib-1.2_1.2.10.bb b/recipes/glib-1.2/glib-1.2_1.2.10.bb
index 77cbee2a14..72eca3a16a 100644
--- a/recipes/glib-1.2/glib-1.2_1.2.10.bb
+++ b/recipes/glib-1.2/glib-1.2_1.2.10.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-1.2-native"
-PR = "r2"
+PR = "r3"
 
 LEAD_SONAME = "libglib-1.2.*"
 
@@ -42,3 +42,4 @@ do_stage () {
 	install -m 0644 ${S}/glib.m4 ${STAGING_DATADIR}/aclocal/glib-1.2.m4
 }
 
+FILES_${PN}-dev += "${libdir}/glib/include/glibconfig.h"
diff --git a/recipes/gnome/at-spi_1.28.0.bb b/recipes/gnome/at-spi_1.28.0.bb
index 3639407eb6..79b48b3f1b 100644
--- a/recipes/gnome/at-spi_1.28.0.bb
+++ b/recipes/gnome/at-spi_1.28.0.bb
@@ -6,8 +6,16 @@ LICENSE = "LGPL"
 DEPENDS = "gtk+ atk libbonobo orbit2 orbit2-native"
 RDEPENDS_${PN} = "libgail-gnome gtk-module-gail"
 
+PR = "r1"
+
 inherit gnome
 
+do_configure_prepend () {
+	sed -i "s|ORBIT_IDL=.*|ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2|" ${S}/configure.in
+	sed -i "s|BONOBO_ACTIVATION_IDL_DIR=.*|BONOBO_ACTIVATION_IDL_DIR=${STAGING_DATADIR}/idl/bonobo-activation-2.0|" ${S}/configure.in
+	sed -i "s|LIBBONOBO_IDL_DIR=.*|LIBBONOBO_IDL_DIR=${STAGING_DATADIR}/idl//bonobo-2.0|" ${S}/configure.in
+}
+
 do_stage () {
 	autotools_stage_all
 }
diff --git a/recipes/gnome/gnome-games_2.24.0.bb b/recipes/gnome/gnome-games_2.24.0.bb
index 4b3fd2077b..971b83e6a7 100644
--- a/recipes/gnome/gnome-games_2.24.0.bb
+++ b/recipes/gnome/gnome-games_2.24.0.bb
@@ -1,9 +1,9 @@
 LICENSE = "GPL"
-DEPENDS = " guile libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common gnome-python-desktop gnome-python gstreamer virtual/libsdl"
+DEPENDS = " guile libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common gnome-python-desktop gnome-python gstreamer virtual/libsdl libsdl-mixer"
 
 inherit gnome distutils-base gconf
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://ggz-unbreak-m4.patch;patch=1 \
            "
@@ -18,7 +18,9 @@ EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \
 
 # disable help dir and crappy old sdl-macro
 do_configure_prepend() {
-	rm m4/sdl.m4
+        if [ -e m4/sdl.m4 ]; then
+	   rm m4/sdl.m4
+        fi
 	for i in $(find ${S} -name "Makefile.am") ; do
 		sed -i -e s:help::g $i
 	done
diff --git a/recipes/gnome/gnome-keyring_2.28.0.bb b/recipes/gnome/gnome-keyring_2.28.2.bb
index 46d2de0fd0..70a7349a3b 100644
--- a/recipes/gnome/gnome-keyring_2.28.0.bb
+++ b/recipes/gnome/gnome-keyring_2.28.2.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SECTION = "x11/gnome"
 DEPENDS = " libpam gconf gtk+ libtasn1 libtasn1-native libgcrypt"
 
-inherit autotools gnome pkgconfig
+inherit gnome pkgconfig
 
 EXTRA_OECONF = "--disable-gtk-doc --enable-pam --with-pam-dir=${libdir}/security/"
 
@@ -23,6 +23,3 @@ PACKAGES =+ "gnome-keyring-pam-plugin"
 FILES_gnome-keyring-pam-plugin = "${libdir}/security/*.so"
 FILES_${PN}-dbg += "${libdir}/gnome-keyring/*/.debug ${libdir}/security/.debug"
 
-do_stage() {
-        autotools_stage_all
-}
diff --git a/recipes/gnome/libbonobo_2.24.1.bb b/recipes/gnome/libbonobo_2.24.2.bb
index efc71d24a8..efc71d24a8 100644
--- a/recipes/gnome/libbonobo_2.24.1.bb
+++ b/recipes/gnome/libbonobo_2.24.2.bb
diff --git a/recipes/gnome/libgdata_0.5.1.bb b/recipes/gnome/libgdata_0.5.1.bb
new file mode 100644
index 0000000000..7c510d0b5f
--- /dev/null
+++ b/recipes/gnome/libgdata_0.5.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "libgdata is a GLib-based library for accessing online service APIs"
+LICENSE = "LGPL"
+DEPENDS = "libxml2 glib-2.0 libsoup-2.4"
+
+inherit gnome lib_package autotools_stage
+
+SRC_URI += " \
+           file://gtk-doc.make \
+"
+
+do_configure_prepend() {
+    cp ${WORKDIR}/gtk-doc.make ${S}/
+    sed -i -e s:docs::g ${S}/Makefile.am
+    echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make
+}
+
+
+
diff --git a/recipes/irda-utils/irdadump/glib2.patch b/recipes/irda-utils/irdadump/glib2.patch
new file mode 100644
index 0000000000..ea37ab151b
--- /dev/null
+++ b/recipes/irda-utils/irdadump/glib2.patch
@@ -0,0 +1,13 @@
+Index: irdadump/configure.in
+===================================================================
+--- irdadump.orig/configure.in
++++ irdadump/configure.in
+@@ -9,7 +9,7 @@ AC_PROG_MAKE_SET
+ 
+ dnl Checks for libraries.
+ AM_PROG_LIBTOOL
+-AM_PATH_GLIB(1.2.0)
++AM_PATH_GLIB_2_0
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/recipes/irda-utils/irdadump_0.9.16.bb b/recipes/irda-utils/irdadump_0.9.16.bb
index 5c64b2dd96..90fd03ecb3 100644
--- a/recipes/irda-utils/irdadump_0.9.16.bb
+++ b/recipes/irda-utils/irdadump_0.9.16.bb
@@ -1,14 +1,16 @@
 DESCRIPTION = "Utility to dump IrDA traffic."
 SECTION = "base"
 LICENSE = "GPL"
-DEPENDS = "glib-1.2"
+DEPENDS = "glib-2.0 pkgconfig"
+PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
+	   file://glib2.patch;patch=1"
 
 S="${WORKDIR}/irda-utils-${PV}/irdadump"
 
-EXTRA_CFLAGS += "-I${STAGING_INCDIR}/glib-1.2/"
-EXTRA_LDFLAGS += "-lglib"
+EXTRA_CFLAGS += "`pkg-config --cflags glib-2.0`"
+EXTRA_LDFLAGS += "`pkg-config --libs glib-2.0`"
 
 inherit autotools
 
diff --git a/recipes/konqueror/konqueror-embedded_20060404.bb b/recipes/konqueror/konqueror-embedded_20060404.bb
index a84f47d471..9f6ed35aeb 100644
--- a/recipes/konqueror/konqueror-embedded_20060404.bb
+++ b/recipes/konqueror/konqueror-embedded_20060404.bb
@@ -21,7 +21,7 @@ S = "${WORKDIR}/kdenox"
 export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
 export MOC = "${STAGING_BINDIR_NATIVE}/moc"
 export UIC = "${STAGING_BINDIR_NATIVE}/uic"
-export exec_prefix = "${palmtopdir}"
+#export exec_prefix = "${palmtopdir}"
 export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS"
 export PCRE_CONFIG = "invalid"
 # uncomment this for a static build
diff --git a/recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch b/recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch
new file mode 100644
index 0000000000..65e790a145
--- /dev/null
+++ b/recipes/libqpe/libqpe-opie/unhide_lnkproperties_destructor.patch
@@ -0,0 +1,24 @@
+Dont hide destructor, if we do then in moc_lnkproperties.cpp its not
+seen and compiler puts in a default one and inlines it which is then
+hidden as we ask it to use -fvisibility-inlines-hidden
+
+Now linker can merge the symbol visivility  and promotes the most
+restrictive visivility in output which means that the library will have
+the destructor but it will be hidden 
+
+-Khem
+
+Index: library/lnkproperties.h
+===================================================================
+--- library.orig/lnkproperties.h	2010-01-19 10:49:36.771348810 -0800
++++ library/lnkproperties.h	2010-01-19 10:49:59.318857574 -0800
+@@ -45,8 +45,8 @@
+ //      have this class.
+ #ifdef QTOPIA_INTERNAL_FSLP
+     LnkProperties( AppLnk* lnk, QWidget* parent = 0 );
+-    ~LnkProperties();
+ #endif
++    ~LnkProperties();
+ 
+     void done(int);
+ private slots:
diff --git a/recipes/libqpe/libqpe-opie_1.2.4.bb b/recipes/libqpe/libqpe-opie_1.2.4.bb
index 5c1690ec12..bb154d013f 100644
--- a/recipes/libqpe/libqpe-opie_1.2.4.bb
+++ b/recipes/libqpe/libqpe-opie_1.2.4.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
@@ -8,5 +8,6 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
            file://unbreak-logging.patch;patch=1 \
            file://citytime-path-2.patch;patch=1 \
            file://no-include-pro.patch;patch=1 \
+           file://unhide_lnkproperties_destructor.patch;patch=1 \
           "
 
diff --git a/recipes/libsdl/libsdl-x11-1.2.14/sdl.m4 b/recipes/libsdl/libsdl-x11-1.2.14/sdl.m4
new file mode 100644
index 0000000000..6acf1b2fc3
--- /dev/null
+++ b/recipes/libsdl/libsdl-x11-1.2.14/sdl.m4
@@ -0,0 +1,203 @@
+# Configure paths for SDL
+# Sam Lantinga 9/21/99
+# stolen from Manish Singh
+# stolen back from Frank Belew
+# stolen from Manish Singh
+# Shamelessly stolen from Owen Taylor
+
+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+dnl
+AC_DEFUN([AM_PATH_SDL],
+[dnl 
+dnl Get the cflags and libraries from the sdl-config script
+dnl
+AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
+            sdl_prefix="$withval", sdl_prefix="")
+AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+            sdl_exec_prefix="$withval", sdl_exec_prefix="")
+AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
+		    , enable_sdltest=yes)
+
+  min_sdl_version=ifelse([$1], ,1.2.0,$1)
+
+  if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
+    PKG_CHECK_MODULES(SDL, [sdl >= $min_sdl_version],
+           [sdl_pc=yes],
+           [dnl
+             AC_MSG_RESULT(no)
+             sdl_pc=no
+           ])
+  else
+    sdl_pc=no
+    if test x$sdl_exec_prefix != x ; then
+      sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
+      if test x${SDL_CONFIG+set} != xset ; then
+        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+      fi
+    fi
+    if test x$sdl_prefix != x ; then
+      sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
+      if test x${SDL_CONFIG+set} != xset ; then
+        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+      fi
+    fi
+  fi
+
+  if test "x$sdl_pc" = xyes ; then
+    no_sdl=""
+    SDL_CONFIG="pkg-config sdl"
+  else
+    as_save_PATH="$PATH"
+    if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
+      PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+    fi
+    AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+    PATH="$as_save_PATH"
+    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+    no_sdl=""
+
+    if test "$SDL_CONFIG" = "no" ; then
+      no_sdl=yes
+    else
+      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
+      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
+
+      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
+             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
+             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+      if test "x$enable_sdltest" = "xyes" ; then
+        ac_save_CFLAGS="$CFLAGS"
+        ac_save_CXXFLAGS="$CXXFLAGS"
+        ac_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $SDL_CFLAGS"
+        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+        LIBS="$LIBS $SDL_LIBS"
+dnl
+dnl Now check if the installed SDL is sufficiently new. (Also sanity
+dnl checks the results of sdl-config to some extent
+dnl
+      rm -f conf.sdltest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "SDL.h"
+
+char*
+my_strdup (char *str)
+{
+  char *new_str;
+  
+  if (str)
+    {
+      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+      strcpy (new_str, str);
+    }
+  else
+    new_str = NULL;
+  
+  return new_str;
+}
+
+int main (int argc, char *argv[])
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  /* This hangs on some systems (?)
+  system ("touch conf.sdltest");
+  */
+  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = my_strdup("$min_sdl_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_sdl_version");
+     exit(1);
+   }
+
+   if (($sdl_major_version > major) ||
+      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+    {
+      return 0;
+    }
+  else
+    {
+      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+      printf("*** best to upgrade to the required version.\n");
+      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+      printf("*** config.cache before re-running configure\n");
+      return 1;
+    }
+}
+
+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+        CFLAGS="$ac_save_CFLAGS"
+        CXXFLAGS="$ac_save_CXXFLAGS"
+        LIBS="$ac_save_LIBS"
+      fi
+    fi
+    if test "x$no_sdl" = x ; then
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_RESULT(no)
+    fi
+  fi
+  if test "x$no_sdl" = x ; then
+     ifelse([$2], , :, [$2])
+  else
+     if test "$SDL_CONFIG" = "no" ; then
+       echo "*** The sdl-config script installed by SDL could not be found"
+       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the SDL_CONFIG environment variable to the"
+       echo "*** full path to sdl-config."
+     else
+       if test -f conf.sdltest ; then
+        :
+       else
+          echo "*** Could not run SDL test program, checking why..."
+          CFLAGS="$CFLAGS $SDL_CFLAGS"
+          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+          LIBS="$LIBS $SDL_LIBS"
+          AC_TRY_LINK([
+#include <stdio.h>
+#include "SDL.h"
+
+int main(int argc, char *argv[])
+{ return 0; }
+#undef  main
+#define main K_and_R_C_main
+],      [ return 0; ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding SDL or finding the wrong"
+          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          CXXFLAGS="$ac_save_CXXFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     SDL_CFLAGS=""
+     SDL_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(SDL_CFLAGS)
+  AC_SUBST(SDL_LIBS)
+  rm -f conf.sdltest
+])
diff --git a/recipes/libsdl/libsdl-x11_1.2.14.bb b/recipes/libsdl/libsdl-x11_1.2.14.bb
index b35cc26dfe..d606e801de 100644
--- a/recipes/libsdl/libsdl-x11_1.2.14.bb
+++ b/recipes/libsdl/libsdl-x11_1.2.14.bb
@@ -8,10 +8,11 @@ LICENSE = "LGPL"
 DEPENDS = "alsa-lib virtual/libgl virtual/libx11 libxext tslib"
 DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext tslib"
 PROVIDES = "virtual/libsdl"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = " \
   http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+  file://sdl.m4 \
 "
 
 S = "${WORKDIR}/SDL-${PV}"
@@ -40,6 +41,9 @@ do_configure_append () {
   # prevent libtool from linking libs against libstdc++, libgcc, ...
   cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
   mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
+
+  # copy new sdl.m4 macrofile to the dir for installing
+  cp ${WORKDIR}/sdl.m4 ${S}/
 }
 
 do_stage() {
diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig
index 8778456c56..f01741d14f 100644
--- a/recipes/linux/linux-2.6.24/hipox/defconfig
+++ b/recipes/linux/linux-2.6.24/hipox/defconfig
@@ -166,7 +166,10 @@ CONFIG_ARCH_HIPOX_UART2=y
 CONFIG_ARCH_HIPOX_UART2_DEBUG=y
 CONFIG_ARCH_HIPOX_UART2_BOOTPROGRESS=y
 # CONFIG_ARCH_HIPOX_UART2_MODEM is not set
-# CONFIG_ARCH_HIPOX_UART3 is not set
+CONFIG_ARCH_HIPOX_UART3=y
+# CONFIG_ARCH_HIPOX_UART3_DEBUG is not set
+# CONFIG_ARCH_HIPOX_UART3_BOOTPROGRESS is not set
+# CONFIG_ARCH_HIPOX_UART3_MODEM is not set
 CONFIG_ARCH_HIPOX_PCI_REQGNT_0=y
 # CONFIG_ARCH_HIPOX_PCI_REQGNT_1 is not set
 # CONFIG_ARCH_HIPOX_PCI_REQGNT_2 is not set
@@ -212,8 +215,8 @@ CONFIG_TACHO_THERM_AND_FAN=m
 # CONFIG_HIPOX_USB_TEST_MODES is not set
 # CONFIG_LEDS_TRIGGER_SATA_DISK is not set
 # CONFIG_HIPOX_LED_TEST is not set
-CONFIG_HIPOX_I2C_SDA=6
-CONFIG_HIPOX_I2C_SCL=7
+CONFIG_HIPOX_I2C_SDA=26
+CONFIG_HIPOX_I2C_SCL=25
 # CONFIG_HIPOX_USB_PORTA_POWER_CONTROL is not set
 # CONFIG_HIPOX_USB_PORTB_POWER_CONTROL is not set
 # CONFIG_HIPOX_USB_PORTC_POWER_CONTROL is not set
diff --git a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
index c7a32421bb..e63bbd73dc 100644
--- a/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
+++ b/recipes/linux/linux-openmoko-2.6.32/om-gta02/defconfig
@@ -1332,7 +1332,7 @@ CONFIG_USB_ETH_RNDIS=y
 # CONFIG_NOP_USB_XCEIV is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
+CONFIG_MMC_UNSAFE_RESUME=y
 
 #
 # MMC/SD/SDIO Card Drivers
diff --git a/recipes/mokomaze/mokomaze_0.5.5.bb b/recipes/mokomaze/mokomaze_0.5.5.bb
index 6fbe415d2e..f15ca0ff53 100644
--- a/recipes/mokomaze/mokomaze_0.5.5.bb
+++ b/recipes/mokomaze/mokomaze_0.5.5.bb
@@ -8,7 +8,7 @@ RDEPENDS="ttf-liberation-mono libpng"
 
 RDEPENDS_shr += "fsoraw"
 
-PR="r1"
+PR="r2"
 PV="0.5.5+git8"
 
 
diff --git a/recipes/mozilla/firefox_3.5.2.bb b/recipes/mozilla/firefox_3.5.2.bb
index f126f13763..3d940d7af5 100644
--- a/recipes/mozilla/firefox_3.5.2.bb
+++ b/recipes/mozilla/firefox_3.5.2.bb
@@ -1,5 +1,5 @@
-DEPENDS += "cairo"
-PR = "r2"
+DEPENDS += "cairo sqlite3"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
 	file://jsautocfg.h \
diff --git a/recipes/mozilla/firefox_3.5.4.bb b/recipes/mozilla/firefox_3.5.4.bb
index 37be0fb858..8ba6ba15db 100644
--- a/recipes/mozilla/firefox_3.5.4.bb
+++ b/recipes/mozilla/firefox_3.5.4.bb
@@ -1,6 +1,6 @@
-DEPENDS += "cairo"
+DEPENDS += "cairo sqlite3"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
 	file://jsautocfg.h \
diff --git a/recipes/mozilla/firefox_3.5.5.bb b/recipes/mozilla/firefox_3.5.5.bb
index a440382d14..da54872046 100644
--- a/recipes/mozilla/firefox_3.5.5.bb
+++ b/recipes/mozilla/firefox_3.5.5.bb
@@ -1,6 +1,6 @@
-DEPENDS += "cairo"
+DEPENDS += "cairo sqlite3"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}.source.tar.bz2 \
 	file://jsautocfg.h \
diff --git a/recipes/mozilla/firefox_3.5b4.bb b/recipes/mozilla/firefox_3.5b4.bb
index 149ee3cbdf..4a12329231 100644
--- a/recipes/mozilla/firefox_3.5b4.bb
+++ b/recipes/mozilla/firefox_3.5b4.bb
@@ -1,8 +1,8 @@
-DEPENDS += "cairo"
+DEPENDS += "cairo sqlite"
 
 PV = "3.0.1+3.5b4"
 MOZPV = "3.5b4"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${MOZPV}-candidates/build1/source/firefox-${MOZPV}-source.tar.bz2 \
 	file://jsautocfg.h \
diff --git a/recipes/libpixman/libpixman-native_0.12.0.bb b/recipes/obsolete/libpixman/libpixman-native_0.12.0.bb
index 808cc86d1a..808cc86d1a 100644
--- a/recipes/libpixman/libpixman-native_0.12.0.bb
+++ b/recipes/obsolete/libpixman/libpixman-native_0.12.0.bb
diff --git a/recipes/libpixman/libpixman_0.1.5.bb b/recipes/obsolete/libpixman/libpixman_0.1.5.bb
index bf23947fc1..bf23947fc1 100644
--- a/recipes/libpixman/libpixman_0.1.5.bb
+++ b/recipes/obsolete/libpixman/libpixman_0.1.5.bb
diff --git a/recipes/libpixman/libpixman_0.1.6.bb b/recipes/obsolete/libpixman/libpixman_0.1.6.bb
index bf23947fc1..bf23947fc1 100644
--- a/recipes/libpixman/libpixman_0.1.6.bb
+++ b/recipes/obsolete/libpixman/libpixman_0.1.6.bb
diff --git a/recipes/libpixman/libpixman_0.10.0.bb b/recipes/obsolete/libpixman/libpixman_0.10.0.bb
index fba7dc9152..fba7dc9152 100644
--- a/recipes/libpixman/libpixman_0.10.0.bb
+++ b/recipes/obsolete/libpixman/libpixman_0.10.0.bb
diff --git a/recipes/libpixman/libpixman_0.9.6.bb b/recipes/obsolete/libpixman/libpixman_0.9.6.bb
index fba7dc9152..fba7dc9152 100644
--- a/recipes/libpixman/libpixman_0.9.6.bb
+++ b/recipes/obsolete/libpixman/libpixman_0.9.6.bb
diff --git a/recipes/libpixman/libpixman_cvs.bb b/recipes/obsolete/libpixman/libpixman_cvs.bb
index a75a284bca..a75a284bca 100644
--- a/recipes/libpixman/libpixman_cvs.bb
+++ b/recipes/obsolete/libpixman/libpixman_cvs.bb
diff --git a/recipes/openmoko-3rdparty/rtmom_0.1.3.bb b/recipes/openmoko-3rdparty/rtmom_0.1.3.bb
new file mode 100644
index 0000000000..10ab501916
--- /dev/null
+++ b/recipes/openmoko-3rdparty/rtmom_0.1.3.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Elementary based client for Remember the Milk written in Python. "
+AUTHOR = "Michael Pilgermann"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://freshmeat.net/projects/rtmom"
+SRCNAME = "rtmom"
+DEPENDS = "python python-elementary"
+RDEPENDS = "python-core pyrtm"
+RSUGGESTS_${PN} = "python-simplejson"
+
+PACKAGE_ARCH = "all"
+
+PR = "r0"
+
+SRC_URI = "http://cloud.github.com/downloads/kichkasch/rtmom/rtmom-src-${PV}.tar.gz"
+
+FILES_${PN} += "/opt/rtmom \
+                ${datadir}/pixmaps \
+                ${datadir}/applications \
+                ${datadir}/doc/rtmom"
+CONFFILES_${PN} += "/usr/share/doc/${PN}/rtmom.conf.example"
+
+do_compile() {
+	${STAGING_BINDIR_NATIVE}/python ${S}/setup.py build ${D}
+}
+
+do_install() {
+	${STAGING_BINDIR_NATIVE}/python ${S}/setup.py install ${D}
+	rm -rf ${D}/opt/rtmom/build/
+	rm -rf ${D}/opt/rtmom/patches/
+}
diff --git a/recipes/opie-taskbar/opie-taskbar/launcher.patch b/recipes/opie-taskbar/opie-taskbar/launcher.patch
deleted file mode 100644
index e7f90f9185..0000000000
--- a/recipes/opie-taskbar/opie-taskbar/launcher.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: launcher/launcher.cpp
-===================================================================
---- launcher.orig/launcher.cpp	2009-12-23 22:29:17.396221157 +0100
-+++ launcher/launcher.cpp	2009-12-23 22:31:45.849117517 +0100
-@@ -646,10 +646,10 @@
-     // Not supported: flat is simpler for the user
-     } else {
- /* ### libqtopia FIXME also moving docLnks... */
--        LnkProperties prop(appLnk,0 );
-+    /*    LnkProperties prop(appLnk,0 );
- 
-         if (QPEApplication::execDialog( &prop )==QDialog::Accepted && tabs->currentView()==tabs->docView()) {
--        }
-+        }*/
-     }
- }
- 
diff --git a/recipes/opie-taskbar/opie-taskbar_1.2.4.bb b/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
index 7648747fa6..b5660451a6 100644
--- a/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
+++ b/recipes/opie-taskbar/opie-taskbar_1.2.4.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
@@ -14,5 +14,4 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
 	   file://restart-from-bindir.patch;patch=1 \
            file://server-pro-1.2.4.patch;patch=1 \
 	   file://firstuse-path.patch;patch=1 \
-           file://launcher.patch;patch=1 \
           "
diff --git a/recipes/parted/parted_1.8.8.bb b/recipes/parted/parted_1.8.8.bb
index e93dbc8dfc..4ab4aa62f9 100644
--- a/recipes/parted/parted_1.8.8.bb
+++ b/recipes/parted/parted_1.8.8.bb
@@ -2,9 +2,8 @@ DESCRIPTION = "parted, the GNU partition resizing program"
 HOMEPAGE = "http://www.gnu.org/software/parted/parted.html"
 LICENSE = "GPLv3"
 SECTION = "console/tools"
-DEPENDS = "readline e2fsprogs-libs"
-
-PR = "r2"
+DEPENDS = "readline util-linux-ng"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \
 	   file://use_llseek_syscall.patch;patch=1 \
diff --git a/recipes/preboot/files/etc/init.d/usbnet b/recipes/preboot/files/etc/init.d/usbnet
new file mode 100644
index 0000000000..e6c7f4e412
--- /dev/null
+++ b/recipes/preboot/files/etc/init.d/usbnet
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# usb gadget configuration:
+# there already different configurations on the palm pre defined, we choose nr 5
+# cause it provides the usbnet, novacom and storage gadget
+if [ -e /sys/class/usb_gadget/config_num ]; then
+        echo 5 > /sys/class/usb_gadget/config_num
+fi
+
diff --git a/recipes/preboot/files/etc/miniboot.sh b/recipes/preboot/files/etc/miniboot.sh
new file mode 100644
index 0000000000..1997ff8646
--- /dev/null
+++ b/recipes/preboot/files/etc/miniboot.sh
@@ -0,0 +1,43 @@
+#!/bin/sh                                
+
+# Mount proc
+mount -t proc proc /proc -o rw,noexec,nosuid,nodev
+# Mount sys
+mount -t sysfs sys /sys -o rw,noexec,nosuid,nodev
+
+# Mount root rw
+mount / -o remount,rw
+
+# Prep modules
+depmod -A
+
+# Populate /dev
+/etc/init.d/udev start
+
+# Mount everything
+# mount -a
+
+# Setup a proper /tmp using tmpfs
+cat /proc/mounts | grep -q "\s/tmp\s"
+[ "x$?" != "x0" ] && mount -t tmpfs tmpfs /tmp
+
+cat /proc/mounts | grep -q "\s/dev/pts\s"
+[ "x$?" != "x0" ] && mount -t devpts devpts /dev/pts
+
+# Set the hostname
+hostname -F /etc/hostname
+
+# USB gadget configuration
+if [ -e /sys/class/usb_gadget/config_num ]; then
+	echo 5 > /sys/class/usb_gadget/config_num
+fi
+
+# USB network configuration
+ifup -f usb0
+ifconfig usb0 192.168.0.202
+
+# Dropbear ssh service
+/etc/init.d/dropbear start
+
+# Spin relaunching login
+while true; do getty 115200 console; done
diff --git a/recipes/preboot/initramfs-preboot-image.bb b/recipes/preboot/initramfs-preboot-image.bb
new file mode 100644
index 0000000000..0675916680
--- /dev/null
+++ b/recipes/preboot/initramfs-preboot-image.bb
@@ -0,0 +1,69 @@
+#initramfs image which mounts the rootfilesystem and kexecs a kernel from there
+PR = "r1"
+
+ONLINE_PACKAGE_MANAGEMENT = "none"
+IMAGE_FSTYPES = "cpio.gz"
+
+export IMAGE_BASENAME = "initramfs-preboot-image"
+
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
+# avoid circular dependencies
+EXTRA_IMAGEDEPENDS = ""
+
+IMAGE_INSTALL = " \
+	task-boot \
+	util-linux-ng-mount util-linux-ng-umount \
+	dropbear \
+	fontconfig \
+	ttf-freefonts \
+	eina \
+	evas \
+	edje \
+	efreet \
+	eet \
+	edbus \
+	elementary \
+	elementary-themes \
+	elementary-tests \
+	fbset \
+	fbset-init \
+    msmcommd \
+#	lvm2 \
+#	preboot \
+	"
+
+IMAGE_LINGUAS = ""
+
+inherit image
+
+preboot_palmpre_rootfs_postprocess() {
+	# copy all our files to the rootfs
+	dirs=`find ${FILESDIR} -type d -printf "%P\n" | grep -v "^.$" | grep -v ".git"`
+	for dir in $dirs; do
+		mkdir -p ${IMAGE_ROOTFS}/$dir
+	done
+	files=`find ${FILESDIR} -type f -printf "%P\n" | grep -v ".git"`
+	for file in $files; do
+		cp -f ${FILESDIR}/$file ${IMAGE_ROOTFS}/$file
+	done
+
+	curdir=$PWD
+	cd ${IMAGE_ROOTFS}
+
+	# install our usbnet initscript
+	chmod +x etc/init.d/usbnet
+#	ln -sf ../init.d/usbnet ${IMAGE_ROOTFS}/etc/rcS.d/S15usbnet
+
+	# miniboot sequence (just for debugging)
+	rm ${IMAGE_ROOTFS}/sbin/init
+	chmod +x ${IMAGE_ROOTFS}/etc/miniboot.sh 
+	ln -sf /etc/miniboot.sh ${IMAGE_ROOTFS}/init
+	ln -sf ../etc/miniboot.sh ${IMAGE_ROOTFS}/sbin/init
+
+	cd $curdir
+}
+
+ROOTFS_POSTPROCESS_COMMAND_palmpre += " preboot_palmpre_rootfs_postprocess"
+
+
diff --git a/recipes/preboot/linux-preboot-palmpre_2.6.24.bb b/recipes/preboot/linux-preboot-palmpre_2.6.24.bb
new file mode 100644
index 0000000000..e2d278cb68
--- /dev/null
+++ b/recipes/preboot/linux-preboot-palmpre_2.6.24.bb
@@ -0,0 +1,24 @@
+require linux-preboot.inc
+
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_palmpre = "-1"
+
+# Hacks should clearly named and at the bottom
+SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
+           "
+
+SRC_URI_append_palmpre = "\
+http://palm.cdnetworks.net/opensource/1.3.1/linuxkernel-2.6.24-patch.gz;patch=1 \
+"
+S = "${WORKDIR}/linux-2.6.24"
+
+# We try to build the identical kernel as Palms here, use their defconfig.
+do_configure_prepend() {
+        install -m 0644 ${S}/arch/arm/configs/omap_sirloin_3430_defconfig ${WORKDIR}/defconfig
+}
+
+# linux.inc overrides LOCAVERSION but we like to stay with the one used originally
+do_compile_prepend() {
+	sed -i -e '/CONFIG_LOCALVERSION=/d' ${S}/.config
+	echo 'CONFIG_LOCALVERSION="-joplin-3430"' >>${S}/.config
+}
diff --git a/recipes/preboot/linux-preboot.inc b/recipes/preboot/linux-preboot.inc
new file mode 100644
index 0000000000..4f99b71773
--- /dev/null
+++ b/recipes/preboot/linux-preboot.inc
@@ -0,0 +1,54 @@
+# We set PR here, since a change in the kexecboot recipe will need to get picked up by *all* the kernels:
+PR = "r15"
+
+SRC_URI = "file://defconfig"
+
+LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga", d)}'
+
+require ../linux/linux.inc
+
+DONT_CHECK_KERNELSIZE = ""
+INITRAMFS_IMAGE = "initramfs-preboot-image"
+
+# here we set master console on serial
+CMDLINE = "console=tty1 console=ttyS0,115200n8"
+
+PACKAGES = ""
+PROVIDES = ""
+
+KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-preboot-${PV}-${PR}-${MACHINE}"
+KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-preboot-${MACHINE}"
+
+do_configure[depends] += "${INITRAMFS_IMAGE}:do_rootfs"
+
+do_configure_append() {
+sed -i -e /CONFIG_BLK_DEV_INITRD/d \
+       -e /CONFIG_KEXEC/d \
+       -e /CONFIG_INITRAMFS_SOURCE/d \
+       -e /=m/d \
+       -e /CONFIG_MODULES/d \
+       -e /CONFIG_DEBUG_ERRORS/d \
+       -e /CONFIG_DEBUG_BUGVERBOSE/d \
+       -e /CONFIG_DEBUG_KERNEL/d \
+       ${S}/.config
+
+# Remove last tag appended by linux.inc (output messes screen)
+sed -i -e /CONFIG_CMDLINE/s/quiet/loglevel=3/1 ${S}/.config
+sed -i -e /CONFIG_CMDLINE/s/debug/loglevel=3/1 ${S}/.config
+
+echo 'CONFIG_BLK_DEV_INITRD=y
+CONFIG_KEXEC=y
+CONFIG_INITRAMFS_SOURCE="initramfs.cpio.gz"
+CONFIG_MODULES=n' >> ${S}/.config
+
+        yes '' | oe_runmake oldconfig
+}
+
+do_stage() {
+}
+
+do_install() {
+}
+
+python do_package() {
+}
diff --git a/recipes/rpm/rpm-native_4.4.2.3.bb b/recipes/rpm/rpm-native_4.4.2.3.bb
index 62cef86a72..ec98cb8817 100644
--- a/recipes/rpm/rpm-native_4.4.2.3.bb
+++ b/recipes/rpm/rpm-native_4.4.2.3.bb
@@ -4,6 +4,3 @@ require rpm-${PV}.inc
 
 DEPENDS = "beecrypt-native gettext-native zlib-native file-native popt-native python-native"
 PACKAGES = ""
-
-export localstatedir = "${layout_localstatedir}"
-export varprefix = "${layout_localstatedir}"
diff --git a/recipes/rygel/rygel_0.4.8.bb b/recipes/rygel/rygel_0.4.8.bb
index 6d7dd6a930..2e305bbdb1 100644
--- a/recipes/rygel/rygel_0.4.8.bb
+++ b/recipes/rygel/rygel_0.4.8.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Collection of DLNA[1] (UPnP[2] AV) devices, implemented through a plug-in mechanism."
 SECTION = "network/multimedia"
-DEPENDS = "glib-2.0 gupnp gupnp-av gstreamer sqlite3 libsoup-2.4 automake-native-1.11.1"
+DEPENDS = "glib-2.0 gupnp gupnp-av gstreamer sqlite3 libsoup-2.4 "
 HOMEPAGE = "http://live.gnome.org/Rygel"
 
 SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/rygel/0.4/rygel-${PV}.tar.bz2 \
@@ -8,6 +8,11 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/rygel/0.4/rygel-${PV}.tar.bz2
 
 inherit autotools
 
+# Needs automake 1.11.x, which isn't safe to use yet in OE
+do_configure() {
+	oe_runconf
+}
+
 EXTRA_OECONF = "--enable-vala=no"
 
 FILES_${PN} += "${libdir}/rygel-1.0/librygel*.so ${datadir}/dbus-1/"
diff --git a/recipes/stopwatch/stopwatch_git.bb b/recipes/stopwatch/stopwatch_git.bb
new file mode 100644
index 0000000000..f0d40da54b
--- /dev/null
+++ b/recipes/stopwatch/stopwatch_git.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Simple Qt based stop watch"
+AUTHOR = "Christof Musik"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+HOMEPAGE = "http://git.senfdax.de"
+LICENSE = "GPL QPL"
+DEPENDS = "qt4-x11-free"
+PV = "1.3.1+gitr${SRCREV}"
+PR = "r0"
+
+inherit qt4x11
+
+SRC_URI = "git://git.senfdax.de/git/stopwatch;protocol=http;tag=master;branch=master"
+S = "${WORKDIR}/git/"
+
+do_configure() {
+    ${OE_QMAKE_QMAKE}
+}
+
+do_compile() {
+    oe_runmake
+}
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 ${S}stopwatch ${D}${bindir}
+    install -d ${D}${datadir}/applications
+    install ${S}desktop/stopwatch.desktop ${D}${datadir}/applications/
+    install -d ${D}${datadir}/pixmaps
+    install ${S}desktop/stopwatch.png ${D}${datadir}/pixmaps/
+    install -d ${D}${datadir}/${PN}
+    install ${S}desktop/om.style ${D}${datadir}/${PN}/
+}
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index aedeb3bb1b..7b5d1a2067 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -266,4 +266,6 @@ RDEPENDS_${PN} += "\
 		qi-ubi \
 		wpa-gui \
 		gabriel \
+		stopwatch \
+		rtmom \
 "
diff --git a/recipes/wxwidgets/wxwidgets-2.9.0.inc b/recipes/wxwidgets/wxwidgets-2.9.0.inc
new file mode 100644
index 0000000000..cb6a971e7a
--- /dev/null
+++ b/recipes/wxwidgets/wxwidgets-2.9.0.inc
@@ -0,0 +1,44 @@
+require wxwidgets.inc
+
+INC_PR = "r0"
+
+PROVIDES += "wxwidgets"
+
+TOOLKIT ?= "gtk2"
+UNICODE ?= "${@base_contains('EXTRA_OECONF', '--disable-unicode', 'ansi', 'unicode', d)}"
+DEBUG ?= "${@base_contains('EXTRA_OECONF', '--enable-debug', 'debug', 'release', d)}"
+RELEASE ?= "${@bb.data.getVar('PV',d,1).rsplit('.', 1)[0]}"
+
+WXCONFIG ?= "${TOOLKIT}-${UNICODE}-${DEBUG}-${RELEASE}"
+
+LEAD_SONAME = "libwx_.*_core-.*\.so"
+
+# Patch and regenerate configure script so that it finds staging root.
+FILESDIR = "${FILE_DIRNAME}/wxwidgets-${PV}"
+SRC_URI += "file://configure-cross_root.patch;patch=1"
+
+do_configure_prepend() {
+	./autogen.sh
+}
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/wx-${RELEASE}/wx
+	cp -pR include/wx ${STAGING_INCDIR}/wx-${RELEASE}
+	cp -pR lib/libwx* ${STAGING_LIBDIR}
+	cp -pR lib/wx     ${STAGING_LIBDIR}
+	cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile
+	cp -p wxwin.m4                          ${STAGING_DATADIR}/aclocal
+	ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}${WXCONFIG} \
+		${STAGING_BINDIR_CROSS}/wx-config
+	sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
+		-e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
+		-e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \
+		-e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \
+		-i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}${WXCONFIG}
+}
+
+do_install() {
+	oe_runmake 'DESTDIR=${D}' install
+	ln -sf  ${libdir}/wx/config/${TARGET_PREFIX}${WXCONFIG} \
+		${D}${bindir}/wx-config
+}
diff --git a/recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch b/recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch
new file mode 100644
index 0000000000..e91a95cfbb
--- /dev/null
+++ b/recipes/wxwidgets/wxwidgets-2.9.0/configure-cross_root.patch
@@ -0,0 +1,30 @@
+diff -pu a/configure.in b/configure.in
+--- a/configure.in	2009-12-04 11:02:26.000000000 +0100
++++ b/configure.in	2009-12-03 22:08:05.000000000 +0100
+@@ -2117,14 +2117,21 @@ if test "$build" != "$host" -a "$GCC" = 
+     dnl the linker. Stripping off the trailing '/bin/ld' gives us a candiate
+     dnl for a 'root' below which libraries and headers for the target system
+     dnl might be installed.
+-    if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
++    m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
++    if test ! -z "$PKG_CONFIG_SYSROOT_DIR"; then
++	    cross_root="$PKG_CONFIG_SYSROOT_DIR"
++    elif cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
+         cross_root=`dirname $cross_root`
+         cross_root=`dirname $cross_root`
++    else
++	cross_root=""
++    fi
+ 
+-        dnl substitute this candiate root for '^/usr' in the search lists,
+-        dnl strip out any that don't start '^/usr'.
+-        SEARCH_LIB=`for x in $SEARCH_LIB; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
+-        SEARCH_INCLUDE=`for x in $SEARCH_INCLUDE; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
++    if test ! -z "$cross_root"; then
++        dnl substitute this candiate root for '^/' in the search lists,
++        dnl strip out any that don't start '^/'.
++        SEARCH_LIB=`for x in $SEARCH_LIB; do echo $x; done | sed -ne "s|^/|$cross_root/|p"`
++        SEARCH_INCLUDE=`for x in $SEARCH_INCLUDE; do echo $x; done | sed -ne "s|^/|$cross_root/|p"`
+         SEARCH_INCLUDE="$SEARCH_INCLUDE $cross_root/include"
+ 
+         dnl also have pkg-config search for *.pc files under this 'root'
diff --git a/recipes/wxwidgets/wxwidgets-ansi_2.9.0.bb b/recipes/wxwidgets/wxwidgets-ansi_2.9.0.bb
new file mode 100644
index 0000000000..aafbe5b238
--- /dev/null
+++ b/recipes/wxwidgets/wxwidgets-ansi_2.9.0.bb
@@ -0,0 +1,5 @@
+require wxwidgets-${PV}.inc
+
+PR = "${INC_PR}.0"
+
+EXTRA_OECONF += "--disable-unicode"
diff --git a/recipes/wxwidgets/wxwidgets-opengl_2.9.0.bb b/recipes/wxwidgets/wxwidgets-opengl_2.9.0.bb
new file mode 100644
index 0000000000..e85658c36a
--- /dev/null
+++ b/recipes/wxwidgets/wxwidgets-opengl_2.9.0.bb
@@ -0,0 +1,7 @@
+require wxwidgets-${PV}.inc
+
+DEPENDS += "virtual/libgl"
+
+PR = "${INC_PR}.0"
+
+EXTRA_OECONF += "--with-opengl"
diff --git a/recipes/wxwidgets/wxwidgets_2.9.0.bb b/recipes/wxwidgets/wxwidgets_2.9.0.bb
new file mode 100644
index 0000000000..c23c969861
--- /dev/null
+++ b/recipes/wxwidgets/wxwidgets_2.9.0.bb
@@ -0,0 +1,3 @@
+require wxwidgets-${PV}.inc
+
+PR = "${INC_PR}.0"
diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch
new file mode 100644
index 0000000000..adec403147
--- /dev/null
+++ b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0001-switch-to-autotools-based-build-system.patch
@@ -0,0 +1,162 @@
+From 1a85be450fba4585c64b3178316603a5ad7dd4e6 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
+Date: Tue, 19 Jan 2010 18:59:52 +0100
+Subject: [PATCH] switch to autotools based build system
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+This patch autotoolize xinput_calibrator for easier (cross)compiling.
+
+Signed-off-by: Petr Štetiar <ynezz@true.cz>
+---
+ Makefile     |   11 -----------
+ Makefile.am  |   41 +++++++++++++++++++++++++++++++++++++++++
+ autogen.sh   |   12 ++++++++++++
+ configure.ac |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 102 insertions(+), 11 deletions(-)
+ delete mode 100644 Makefile
+ create mode 100644 Makefile.am
+ create mode 100755 autogen.sh
+ create mode 100644 configure.ac
+
+diff --git a/Makefile b/Makefile
+deleted file mode 100644
+index c6eabed..0000000
+--- a/Makefile
++++ /dev/null
+@@ -1,11 +0,0 @@
+-all: x11 gtkmm
+-
+-x11: main_x11.cpp gui_x11.cpp
+-	g++ -Wall main_x11.cpp -lX11 -lXi -o xinput_calibrator.x11
+-	cp xinput_calibrator.x11 xinput_calibrator
+-
+-gtkmm: main_gtkmm.cpp gui_gtkmm.cpp
+-	g++ -Wall main_gtkmm.cpp `pkg-config --cflags --libs gtkmm-2.4` -o xinput_calibrator.gtkmm
+-
+-clean:
+-	rm -f xinput_calibrator xinput_calibrator.x11 xinput_calibrator.gtkmm
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..ef8f531
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,41 @@
++#
++# Copyright (c) 2010 Petr Stetiar <ynezz@true.cz>
++#
++# Permission is hereby granted, free of charge, to any person
++# obtaining a copy of this software and associated documentation
++# files (the "Software"), to deal in the Software without
++# restriction, including without limitation the rights to use,
++# copy, modify, merge, publish, distribute, sublicense, and/or sell
++# copies of the Software, and to permit persons to whom the
++# Software is furnished to do so, subject to the following
++# conditions:
++# 
++# The above copyright notice and this permission notice shall be
++# included in all copies or substantial portions of the Software.
++# 
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++# OTHER DEALINGS IN THE SOFTWARE.
++#
++
++#AM_CFLAGS = -Wall -ansi -pedantic -W -Wmissing-prototypes -Wmissing-declarations -Werror -std=gnu99
++
++if BUILD_GTKMM
++bin_PROGRAMS = xinput_calibrator_x11 xinput_calibrator_gtkmm
++xinput_calibrator_gtkmm_SOURCES = main_gtkmm.cpp
++xinput_calibrator_gtkmm_CXXFLAGS = $(GTKMM_CFLAGS)
++xinput_calibrator_gtkmm_LDADD = $(GTKMM_LIBS)
++else
++bin_PROGRAMS = xinput_calibrator_x11
++endif
++
++xinput_calibrator_x11_LDADD = $(XORG_LIBS)
++xinput_calibrator_x11_CFLAGS = $(XORG_CFLAGS)
++xinput_calibrator_x11_SOURCES = main_x11.cpp
++
++EXTRA_DIST = autogen.sh
+diff --git a/autogen.sh b/autogen.sh
+new file mode 100755
+index 0000000..904cd67
+--- /dev/null
++++ b/autogen.sh
+@@ -0,0 +1,12 @@
++#! /bin/sh
++
++srcdir=`dirname $0`
++test -z "$srcdir" && srcdir=.
++
++ORIGDIR=`pwd`
++cd $srcdir
++
++autoreconf -v --install || exit 1
++cd $ORIGDIR || exit $?
++
++$srcdir/configure --enable-maintainer-mode "$@"
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..13257b4
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,49 @@
++#
++# Copyright (c) 2010 Petr Stetiar <ynezz@true.cz>
++#
++# Permission is hereby granted, free of charge, to any person
++# obtaining a copy of this software and associated documentation
++# files (the "Software"), to deal in the Software without
++# restriction, including without limitation the rights to use,
++# copy, modify, merge, publish, distribute, sublicense, and/or sell
++# copies of the Software, and to permit persons to whom the
++# Software is furnished to do so, subject to the following
++# conditions:
++# 
++# The above copyright notice and this permission notice shall be
++# included in all copies or substantial portions of the Software.
++# 
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++# OTHER DEALINGS IN THE SOFTWARE.
++#
++
++AC_PREREQ([2.57])
++AC_INIT(xinput_calibrator,[0.5.0], [http://github.com/tias/xinput_calibrator])
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
++AM_MAINTAINER_MODE
++
++AC_PROG_CC
++AC_PROG_CXX
++AC_PROG_INSTALL
++
++AC_ARG_ENABLE([gtkmm], AS_HELP_STRING([--enable-gtkmm], [Enable GTKMM GUI]))
++AS_IF([test "x$enable_gtkmm" = "xyes"], [
++	PKG_CHECK_MODULES(GTKMM, [gtkmm-2.4])
++	AC_SUBST(GTKMM_CFLAGS)
++	AC_SUBST(GTKMM_LIBS)
++])
++
++AM_CONDITIONAL([BUILD_GTKMM], [test "x$enable_gtkmm" = "xyes"])
++
++PKG_CHECK_MODULES(XORG, [x11 xi])
++AC_SUBST(XORG_CFLAGS)
++AC_SUBST(XORG_LIBS)
++
++AC_CONFIG_FILES(Makefile)
++AC_OUTPUT
+-- 
+1.6.0.4
+
diff --git a/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch
new file mode 100644
index 0000000000..08f430999b
--- /dev/null
+++ b/recipes/xinput-calibrator/xinput-calibrator-0.5.0/0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch
@@ -0,0 +1,32 @@
+From aaf549ecacc05bd5ddd29bb345cae471ce3ab48c Mon Sep 17 00:00:00 2001
+From: Marco Cavallini <m.cavallini@koansoftware.com>
+Date: Thu, 21 Jan 2010 16:46:18 +0100
+Subject: [PATCH] gui_x11.cpp: Load font fixed when 9x15 fails in GuiCalibratorX11
+
+
+Signed-off-by: Marco Cavallini <m.cavallini@koansoftware.com>
+---
+ gui_x11.cpp |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/gui_x11.cpp b/gui_x11.cpp
+index bc483cd..02ddc73 100644
+--- a/gui_x11.cpp
++++ b/gui_x11.cpp
+@@ -112,8 +112,11 @@ GuiCalibratorX11::GuiCalibratorX11(Calibrator* calibrator0)
+     // Load font and get font information structure
+     font_info = XLoadQueryFont(display, "9x15");
+     if (font_info == NULL) {
+-        XCloseDisplay(display);
+-        throw std::runtime_error("Unable to open 9x15 font");
++        font_info = XLoadQueryFont(display, "fixed");
++        if (font_info == NULL) {
++            XCloseDisplay(display);
++            throw std::runtime_error("Unable to open 9x15 neither fixed font");
++        }
+     }
+ 
+     // Compute absolute circle centers
+-- 
+1.6.3.3
+
diff --git a/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
new file mode 100644
index 0000000000..b01d4fd4a9
--- /dev/null
+++ b/recipes/xinput-calibrator/xinput-calibrator_0.5.0.bb
@@ -0,0 +1,15 @@
+DEPENDS = "virtual/libx11 libxi"
+
+SRCREV  = "6af268f1b435f7bdd83335092ddc684054df2110"
+SRC_URI = "git://github.com/tias/xinput_calibrator.git;protocol=git \
+           file://0001-switch-to-autotools-based-build-system.patch;patch=1 \
+           file://0002-gui_x11.cpp-Load-font-fixed-when-9x15-fails-in-GuiCa.patch;patch=1"
+
+PR = "r1"
+inherit autotools
+S = "${WORKDIR}/git/"
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 xinput_calibrator_x11 ${D}${bindir}/xinput_calibrator
+}
diff --git a/recipes/xorg-app/xvidtune_1.0.2.bb b/recipes/xorg-app/xvidtune_1.0.2.bb
new file mode 100644
index 0000000000..bfab14a67a
--- /dev/null
+++ b/recipes/xorg-app/xvidtune_1.0.2.bb
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+PE = "1"
+
+DEPENDS += " libxaw libxxf86vm libxt"
+
+FILES_${PN} += " ${datadir}/X11/app-defaults/Xvidtune "
diff --git a/recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch b/recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch
new file mode 100644
index 0000000000..07754731dd
--- /dev/null
+++ b/recipes/xorg-driver/xf86-input-tslib/double-free-crash.patch
@@ -0,0 +1,20 @@
+xorg-server-1.7.3/hw/xfree86/common/xf86Helper.c contains this code
+causing a double free crash on chvt or exit:
+
+    /* This should *really* be handled in drv->UnInit(dev) call instead, but
+     * if the driver forgets about it make sure we free it or at least crash
+     * with flying colors */
+    if (pInp->private)
+	xfree(pInp->private);
+Index: xf86-input-tslib-0.0.6/src/tslib.c
+===================================================================
+--- xf86-input-tslib-0.0.6.orig/src/tslib.c
++++ xf86-input-tslib-0.0.6/src/tslib.c
+@@ -435,6 +435,7 @@ xf86TslibUninit(InputDriverPtr drv, Inpu
+ 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
+ 	ts_close(priv->ts);
+ 	xfree(pInfo->private);
++	pInfo->private = NULL;
+ 	xf86DeleteInput(pInfo, 0);
+ }
+ 
diff --git a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
index 84d2da0ffd..cce5e9bdd1 100644
--- a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
+++ b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
@@ -4,9 +4,10 @@ DESCRIPTION = "X.Org X server -- tslib input driver"
 RRECOMMENDS += "hal tslib-calibrate"
 DEPENDS += "tslib"
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \
+	   file://double-free-crash.patch;patch=1 \
            file://10-x11-input-tslib.fdi"
 
 do_configure_prepend() {
diff --git a/recipes/xorg-driver/xf86-video-intel_2.10.0.bb b/recipes/xorg-driver/xf86-video-intel_2.10.0.bb
new file mode 100644
index 0000000000..eed1fcb600
--- /dev/null
+++ b/recipes/xorg-driver/xf86-video-intel_2.10.0.bb
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
diff --git a/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb
new file mode 100644
index 0000000000..c2b6b7608a
--- /dev/null
+++ b/recipes/xorg-driver/xf86-video-vesa_2.3.0.bb
@@ -0,0 +1,2 @@
+require xorg-driver-video.inc
+PE = "1"
diff --git a/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb b/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb
new file mode 100644
index 0000000000..994b8b6a3c
--- /dev/null
+++ b/recipes/xorg-driver/xf86-video-vmware_10.16.9.bb
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
diff --git a/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch b/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..5d0a24ca2d
--- /dev/null
+++ b/recipes/xorg-lib/libx11-1.3.3/x11_disable_makekeys.patch
@@ -0,0 +1,23 @@
+diff -uNr libX11-1.3.3.orig/src/util/Makefile.am libX11-1.3.3/src/util/Makefile.am
+--- libX11-1.3.3.orig/src/util/Makefile.am	2010-01-15 02:11:36.000000000 +0100
++++ libX11-1.3.3/src/util/Makefile.am	2010-01-18 14:48:27.000000000 +0100
+@@ -1,19 +1 @@
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS=$(X11_CFLAGS)
+-
+-CC = @CC_FOR_BUILD@
+-
+ EXTRA_DIST = mkks.sh
+-
+-if LINT
+-# Check source code with tools like lint & sparse
+-
+-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-		$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+-
+-lint:
+-	$(LINT) $(ALL_LINT_FLAGS) makekeys.c
+-
+-endif LINT
diff --git a/recipes/xorg-lib/libx11-native_1.3.3.bb b/recipes/xorg-lib/libx11-native_1.3.3.bb
new file mode 100644
index 0000000000..98fe79f5c3
--- /dev/null
+++ b/recipes/xorg-lib/libx11-native_1.3.3.bb
@@ -0,0 +1,10 @@
+require libx11_${PV}.bb
+
+SRC_URI += "file://dolt-fix.patch;patch=1"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
+
+DEPENDS = "xproto-native xextproto-native libxau-native xtrans-native libxdmcp-native xcmiscproto-native xf86bigfontproto-native kbproto-native inputproto-native bigreqsproto-native util-macros-native"
+PROVIDES = ""
+
+inherit native
diff --git a/recipes/xorg-lib/libx11_1.3.3.bb b/recipes/xorg-lib/libx11_1.3.3.bb
new file mode 100644
index 0000000000..8858a09721
--- /dev/null
+++ b/recipes/xorg-lib/libx11_1.3.3.bb
@@ -0,0 +1,33 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "Base X libs."
+DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+            libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
+PROVIDES = "virtual/libx11"
+PE = "1"
+PR = "r3"
+
+XORG_PN = "libX11"
+
+SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \
+#            file://dolt-fix.patch;patch=1 \
+#            file://keysymdef_include.patch;patch=1 \
+"
+
+EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
+
+do_compile() {
+	(
+		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+		cd src/util; 
+		mv makekeys.c.orig makekeys.c || true
+		touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
+		# mv to stop it getting rebuilt
+		mv makekeys.c makekeys.c.orig
+		cd ../../
+	) || exit 1
+	oe_runmake
+}
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
diff --git a/recipes/xorg-lib/pixman_0.16.2.bb b/recipes/xorg-lib/pixman_0.16.2.bb
index 2517f8f354..1a15ac4a96 100644
--- a/recipes/xorg-lib/pixman_0.16.2.bb
+++ b/recipes/xorg-lib/pixman_0.16.2.bb
@@ -3,7 +3,9 @@ PRIORITY = "optional"
 DESCRIPTION = "Low-level pixel manipulation library."
 LICENSE = "X11"
 
-DEFAULT_PREFERENCE = "-1"
+PR = "r1"
+
+BBCLASSEXTEND="native"
 
 SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \
 	  "
diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb
index 1b5ca6388f..0c3008de99 100644
--- a/recipes/xorg-lib/pixman_git.bb
+++ b/recipes/xorg-lib/pixman_git.bb
@@ -4,9 +4,11 @@ DESCRIPTION = "Low-level pixel manipulation library."
 LICENSE = "X11"
 
 PV = "0.17.3"
-PR = "r4"
+PR = "r5"
 PR_append = "+gitr${SRCREV}"
 
+BBCLASSEXTEND="native"
+
 SRCREV = "c97b1e803fc214e9880eaeff98410c8fa37f9ddc"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/xorg-proto/dri2proto_2.2.bb b/recipes/xorg-proto/dri2proto_2.2.bb
new file mode 100644
index 0000000000..a0e1fd3989
--- /dev/null
+++ b/recipes/xorg-proto/dri2proto_2.2.bb
@@ -0,0 +1,3 @@
+DESCRIPTION = "DRI2 extension headers"
+
+require xorg-proto-common.inc
diff --git a/recipes/xorg-proto/glproto_1.4.11.bb b/recipes/xorg-proto/glproto_1.4.11.bb
new file mode 100644
index 0000000000..9f09fff7b7
--- /dev/null
+++ b/recipes/xorg-proto/glproto_1.4.11.bb
@@ -0,0 +1,4 @@
+require xorg-proto-common.inc
+
+PR = "r1"
+PE = "1"
diff --git a/recipes/xorg-util/util-macros-native_1.5.0.bb b/recipes/xorg-util/util-macros-native_1.5.0.bb
new file mode 100644
index 0000000000..618e78f116
--- /dev/null
+++ b/recipes/xorg-util/util-macros-native_1.5.0.bb
@@ -0,0 +1,7 @@
+require util-macros_${PV}.bb
+
+inherit native
+
+XORG_PN = "util-macros"
+
+S = "${WORKDIR}/util-macros-${PV}"
diff --git a/recipes/xorg-util/util-macros_1.5.0.bb b/recipes/xorg-util/util-macros_1.5.0.bb
new file mode 100644
index 0000000000..4775fc6901
--- /dev/null
+++ b/recipes/xorg-util/util-macros_1.5.0.bb
@@ -0,0 +1,6 @@
+require xorg-util-common.inc
+
+DESCRIPTION = "X autotools macros"
+PE = "1"
+
+ALLOW_EMPTY = "1"
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch
new file mode 100644
index 0000000000..a947582f15
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.7.4/hack-assume-pixman-supports-overlapped-blt.patch
@@ -0,0 +1,14 @@
+diff --git a/fb/fbcopy.c b/fb/fbcopy.c
+index 07eb663..ba394b7 100644
+--- a/fb/fbcopy.c
++++ b/fb/fbcopy.c
+@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr	pSrcDrawable,
+     while (nbox--)
+     {
+ #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */
+-	if (pm == FB_ALLONES && alu == GXcopy && !reverse &&
+-	    !upsidedown)
++	if (pm == FB_ALLONES && alu == GXcopy)
+ 	{
+ 	    if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp,
+ 			     (pbox->x1 + dx + srcXoff),
diff --git a/recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch b/recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch
new file mode 100644
index 0000000000..d3661cbea2
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg/hack-fbdev-ignore-return-mode.patch
@@ -0,0 +1,39 @@
+Ugly hack that prevents server termination with xf86-video-fbdev-0.4.1
+(and probably other) while returning from chvt or resume on some
+hardware (e. g. zaurus).
+
+Correct fix would require debugging of fbdev mode during LeaveVT and
+EnterVT.
+
+This patch may cause staying in incorrect or corrupted display mode
+after EnterVT, but on man affected devices it does not cause any visible
+problems.
+
+Hacked code is never called on properly written drivers.
+
+Devices affected and testers involved for future patch removal:
+Sharp Zaurus (spitz/akita): Stanislav Brabec <utx@penguin.cz>
+
+See also:
+https://bugzilla.redhat.com/show_bug.cgi?id=238451
+
+The bug (first line indicates that your device is affected):
+
+(EE) FBDEV(0): FBIOPUT_VSCREENINFO succeeded but modified mode
+
+Fatal server error:
+EnterVT failed for screen 0
+
+Index: xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
+===================================================================
+--- xorg-server-1.7.3.orig/hw/xfree86/fbdevhw/fbdevhw.c
++++ xorg-server-1.7.3/hw/xfree86/fbdevhw/fbdevhw.c
+@@ -571,7 +571,7 @@ fbdevHWSetMode(ScrnInfoPtr pScrn, Displa
+ #if DEBUG
+ 		print_fbdev_mode("returned", &set_var);
+ #endif
+-		return FALSE;
++		/* return FALSE; UGLY HACK to allow return from chvt */
+ 	}
+ 
+ 	if (!check)
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
index edede8b3ff..2ecb169a84 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb
@@ -3,11 +3,12 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
 PE = "2"
-PR = "r4"
+PR = "r5"
 
 SRC_URI += "file://sysroot_fix.patch;patch=1 \
             file://dolt-fix-1.7.0.patch;patch=1 \
             file://randr-support-1.7.0.patch;patch=1 \
+            file://hack-fbdev-ignore-return-mode.patch;patch=1 \
            "
 
 SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.4.bb b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
new file mode 100644
index 0000000000..bd2e6f82a8
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.4.bb
@@ -0,0 +1,26 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts"
+PE = "2"
+
+SRC_URI += "file://sysroot_fix.patch;patch=1 \
+            file://dolt-fix-1.7.0.patch;patch=1 \
+            file://randr-support-1.7.0.patch;patch=1 \
+	    file://hack-fbdev-ignore-return-mode.patch;patch=1 \
+           "
+
+SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
+SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1"
+
+do_install_prepend() {
+        mkdir -p ${D}/${libdir}/X11/fonts
+}
+
+# The NVidia driver requires Xinerama support in the X server. Ion uses it.
+XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}"
+
+EXTRA_OECONF += " --enable-config-hal ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx"
+EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests "
+
+export LDFLAGS += " -ldl "