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

40 files changed, 1183 insertions, 290 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index d29ba4bfcf..89ee917d20 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -661,7 +661,7 @@ python base_do_fetch() {
 		bb.note("No conf/checksums.ini found, not checking checksums")
 		return
 	except:
-		bb.note("Creating the CheckSum parser failed")
+		bb.note("Creating the CheckSum parser failed: %s:%s" % (sys.exc_info()[0], sys.exc_info()[1]))
 		return
 
 	pv = bb.data.getVar('PV', d, True)
diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index b5b7b8655b..4978421b63 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -1,7 +1,7 @@
 DEPENDS += " cmake-native "
 
 # We want the staging and installing functions from autotools
-inherit autotools
+inherit autotools_stage
 
 # Use in-tree builds by default but allow this to be changed
 # since some packages do not support them (e.g. llvm 2.5).
diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass
index 26e813a036..37721898d6 100644
--- a/classes/qmake2.bbclass
+++ b/classes/qmake2.bbclass
@@ -19,3 +19,5 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
 export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
 export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
+export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease4"
+export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate4"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 3617415c15..cc93b8957c 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1322,6 +1322,10 @@ sha256=3b732ed179dd34c17d1ba17867b60a36f20d82a3f0eca7b084fcb5396aa2b30c
 md5=84d9e0001fe01c14867256c3fe115899
 sha256=55386de7bf78f67ad2b9ef664a578db66ee53f512a28eb067cd2303f5e23d740
 
+[http://www.cpan.org/modules/by-module/XML/XML-Parser-2.36.tar.gz]
+md5=1b868962b658bd87e1563ecd56498ded
+sha256=9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f
+
 [http://www.cpan.org/modules/by-module/XML/XML-Simple-2.18.tar.gz]
 md5=593aa8001e5c301cdcdb4bb3b63abc33
 sha256=a54967c188cda3e20f496c83be4de3f1740eeaa83c0380712ecd969ad8766826
@@ -3318,6 +3322,10 @@ sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
 md5=328bfec66c312150e4c2a78dcecb504b
 sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef
 
+[http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz]
+md5=1a0926fe4c8228f14a2622b4182b801e
+sha256=ce6e6c3a6b9a3e7695cb7a0f83d4dbb58f1fb246eb706e3caf3fce3b77e186c0
+
 [http://downloads.sourceforge.net/asio/boost_asio_0_3_7.tar.bz2]
 md5=e006cde4b4a28cfce95e43710cd126a9
 sha256=ade3663edc611d558f5a383abccd0a9ab87d6168f422ef4c2a38775e8b7ca575
@@ -4374,6 +4382,10 @@ sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97
 md5=f5b84040e99eeff3a18e11e83b1eb12a
 sha256=e3a35e2ee2cc729bd637a69c7f82d6672317738d29dacab067468bb0634eb0de
 
+[http://www.kernel.org/pub/linux/network/connman/connman-0.46.tar.gz]
+md5=9bcdc528f38bc17ecb92519a28b741f1
+sha256=1853ed3d6400e25ef61ba1c98a7ef0f3984a2bf59aaf3485721cbc1de036b75c
+
 [ftp://ftp.moblin.org/connman/releases/connman-0.8.tar.gz]
 md5=3f1995bf91846b601a25a37832c88cb6
 sha256=d40272cfb9a9990a32f6985056735df53d7368eacc28b31b8141de1fb2cb414d
@@ -5842,6 +5854,10 @@ sha256=a0d03208e335610defc3049d8dd03f4ec7fcf477f44c4897b3f68adc478237ee
 md5=b96a6d4263122f1711db12701d79f738
 sha256=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55
 
+[http://sources.openembedded.org/eject-2.1.5.tar.gz]
+md5=b96a6d4263122f1711db12701d79f738
+sha256=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55
+
 [http://ekg.chmurka.net/ekg-1.6.tar.gz]
 md5=1094eee5062d9b9900c4b28bd68fb564
 sha256=c6dc601e20bb43c94f5689f05bca8e8501af4cff9dd760afdb3d6998c6952c28
@@ -19914,6 +19930,10 @@ sha256=063f00d5b889beee910eb113c8cfbb4fc85cd404693494bcaaf79dd09a98335c
 md5=ba2ee667a8b7606b125b7d32f47ca578
 sha256=d7f52e2217ed1cf367ca93257b27c8acb29fcae4fcaa31b4a94146a3c7a7de33
 
+[http://openvpn.net/release/openvpn-2.1_rc20.tar.gz]
+md5=8187f8f21507faac5e320e32747203b8
+sha256=4d423b48cb3ccc66b5669b9404dcb028cb62af410361c09e6056db0c5d2a1267
+
 [http://downloads.sourceforge.net/gakusei/openwrt-imagetools-svn-rev7641.tar.bz2]
 md5=7f35543286911b827dcbf8d07a7d72be
 sha256=bad49b59646dbea380cc88be13a77d17c70488b8e11e85f7dd474930fa9cf36a
@@ -26090,6 +26110,10 @@ sha256=2edc7cc98fd217f6980d8ba0b3792beed4695d4e8429a11c7237faab04ab47f4
 md5=6e393cc7423b5d228fa3d34c21481ae4
 sha256=9876b0e45a1bd3899222b916ab1d423e9efa3ad9374d55a6a301d5716f2d8a2f
 
+[http://downloads.sourceforge.net/linux-usb/usbutils-0.86.tar.gz]
+md5=34979f675d2bcb3e1b45012fa830a53f
+sha256=b3b2bea6d2cd87660c8201a47071bf2a9889d8ed90c7203cc768b597799c12f4
+
 [http://www.kroah.com/linux-usb/usbview-1.0.tar.gz]
 md5=2ac1bdae03a858b965e895b211a75ad7
 sha256=7a7add52242142f37a7d220c76dfe77090f6592eacdf796e3d07fa61415340fd
@@ -29002,6 +29026,10 @@ sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
 md5=73a366b9892152266b465d7d9c35bef4
 sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
 
+[http://mocha.xfce.org/archive/src/xfce/xfce4-panel/4.6/xfce4-panel-4.6.2.tar.bz2]
+md5=88352816c84cbea57121b0c478976976
+sha256=1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b
+
 [http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2]
 md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7
 sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index f7d78ec01f..f0a064232b 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -189,9 +189,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4913"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "219"
-SRCREV_pn-opkg-native ?= "219"
-SRCREV_pn-opkg-sdk ?= "219"
+SRCREV_pn-opkg ?= "240"
+SRCREV_pn-opkg-native ?= "240"
+SRCREV_pn-opkg-sdk ?= "240"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
@@ -245,7 +245,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "43038"
+EFL_SRCREV ?= "43437"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 6760a5dff6..7f3dff0dd3 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -70,7 +70,7 @@ fi
 for machine in ${ARCH_MACHINES}
 do
         BUILD_MACHINE=$machine
-        BUILD_CLEAN="qmake-native qmake2-native qt-x11-free iso-codes python python-native python-pygtk gnome-icon-theme"
+        BUILD_CLEAN="qmake-native qmake2-native qt-x11-free iso-codes perl perl-native python python-native python-pygtk gnome-icon-theme"
         BUILD_TARGETS=" \
                       abiword \
                       aircrack-ng \
diff --git a/recipes/autofs/autofs.inc b/recipes/autofs/autofs.inc
new file mode 100644
index 0000000000..badadb524a
--- /dev/null
+++ b/recipes/autofs/autofs.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "Kernel based automounter for linux."
+SECTION = "base"
+LICENSE = "GPL"
+INC_PR = "r4"
+EXTRA_OEMAKE += "'RANLIB=${RANLIB}'"
+
+inherit autotools
+
+do_configure_prepend () {
+	if [ ! -e acinclude.m4 ]; then
+		cp aclocal.m4 acinclude.m4
+	fi
+}
+
+do_install () {
+	install -d ${D}${mandir}/man5 ${D}${mandir}/man8 \
+		   ${D}${sbindir}
+	oe_runmake 'INSTALLROOT=${D}' install
+}
diff --git a/recipes/autofs/autofs_3.1.7.bb b/recipes/autofs/autofs_3.1.7.bb
index 05481ed46c..10840d8d33 100644
--- a/recipes/autofs/autofs_3.1.7.bb
+++ b/recipes/autofs/autofs_3.1.7.bb
@@ -1,18 +1,4 @@
-DESCRIPTION = "Kernel based automounter for linux."
-SECTION = "base"
-LICENSE = "GPL"
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v3/autofs-${PV}.tar.bz2"
-
-inherit autotools
+require autofs.inc
 
-do_configure_prepend () {
-	if [ ! -e acinclude.m4 ]; then
-		cp aclocal.m4 acinclude.m4
-	fi
-}
-
-do_install () {
-	install -d ${D}${mandir}/man5 ${D}${mandir}/man8 \
-		   ${D}${sbindir}
-	oe_runmake 'INSTALLROOT=${D}' install
-}
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v3/autofs-${PV}.tar.bz2"
+PR = "${INC_PR}"
diff --git a/recipes/autofs/autofs_4.0.0.bb b/recipes/autofs/autofs_4.0.0.bb
index 6033b8a09a..b08d6aa3bf 100644
--- a/recipes/autofs/autofs_4.0.0.bb
+++ b/recipes/autofs/autofs_4.0.0.bb
@@ -1,17 +1,4 @@
-DESCRIPTION = "Kernel based automounter for linux."
-SECTION = "base"
-LICENSE = "GPL"
+require autofs.inc
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/old/autofs-${PV}-1.tar.bz2"
-
-inherit autotools
-
-do_configure_prepend () {
-	if [ ! -e acinclude.m4 ]; then
-		cp aclocal.m4 acinclude.m4
-	fi
-}
-
-do_install () {
-	oe_runmake 'INSTALLROOT=${D}' install
-}
+PR = "${INC_PR}"
diff --git a/recipes/autofs/autofs_4.1.4.bb b/recipes/autofs/autofs_4.1.4.bb
index 2f998ab220..0ec818a046 100644
--- a/recipes/autofs/autofs_4.1.4.bb
+++ b/recipes/autofs/autofs_4.1.4.bb
@@ -1,8 +1,4 @@
-DESCRIPTION = "Kernel based automounter for linux."
-SECTION = "base"
-LICENSE = "GPL"
-
-PR = "r3"
+require autofs.inc
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \
@@ -14,8 +10,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2
 	   file://auto.net-sort-option-fix.patch;patch=1 \
 	   file://autofs-additional-distros.patch;patch=1 \
 	   file://no-bash.patch;patch=1"
+PR = "${INC_PR}"
 
-inherit autotools update-rc.d
+inherit update-rc.d
 
 INITSCRIPT_NAME = "autofs"
 INITSCRIPT_PARAMS = "defaults"
@@ -24,13 +21,3 @@ INITSCRIPT_PARAMS = "defaults"
 CFLAGS += "${LDFLAGS}"
 EXTRA_OEMAKE = "STRIP=/bin/true"
 PARALLEL_MAKE = ""
-
-do_configure_prepend () {
-	if [ ! -e acinclude.m4 ]; then
-		cp aclocal.m4 acinclude.m4
-	fi
-}
-
-do_install () {
-	oe_runmake 'INSTALLROOT=${D}' install
-}
diff --git a/recipes/boost/boost-14x.inc b/recipes/boost/boost-14x.inc
new file mode 100644
index 0000000000..b1a5f6bb65
--- /dev/null
+++ b/recipes/boost/boost-14x.inc
@@ -0,0 +1,83 @@
+# The Boost web site provides free peer-reviewed portable
+# C++ source libraries. The emphasis is on libraries which
+# work well with the C++ Standard Library. The libraries are
+# intended to be widely useful, and are in regular use by
+# thousands of programmers across a broad spectrum of applications.
+DESCRIPTION = "Free peer-reviewed portable C++ source libraries"
+HOMEPAGE = "http://www.boost.org/"
+SECTION = "libs"
+DEPENDS = "zlib bzip2 python expat"
+PRIORITY = "optional"
+LICENSE = "Boost Software License"
+PR = "r0"
+
+ARM_INSTRUCTION_SET = "arm"
+BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
+BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
+BOOST_P = "boost_${BOOST_VER}"
+
+inherit cmake
+
+EXTRA_OECMAKE = "-DBUILD_SHARED=ON \
+		 -DBUILD_MULTI_THREADED=ON \
+		 -DBUILD_RELEASE=ON \
+                 -DBUILD_DEBUG=OFF \
+		"
+
+BOOST_LIBS = "\
+	date_time \
+	filesystem \
+	graph \
+	iostreams \
+	program_options \
+        python \
+	regex \
+        serialization \
+	signals \
+	system \
+	test \
+	thread \
+	"
+
+# FIXME: for some reason this fails on powerpc
+#BOOST_LIBS += "serialization"
+
+# To enable python, uncomment the following:
+#BOOST_LIBS += "python"
+#DEPENDS += "python"
+#PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}"
+#PYTHON_VERSION = "2.5"
+
+S = "${WORKDIR}/${BOOST_P}"
+
+# Make a package for each library, plus -dev
+PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}"
+python __anonymous () {
+    import bb
+
+    packages = []
+    extras = []
+    for lib in bb.data.getVar('BOOST_LIBS', d, 1).split( ):
+            pkg = "boost-%s" % lib.replace("_", "-")
+            extras.append("--with-%s" % lib)
+            packages.append(pkg)
+            if not bb.data.getVar("FILES_%s" % pkg, d, 1):
+                    bb.data.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so*" % lib, d)
+    bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d)
+    bb.data.setVar("BJAM_EXTRA", " ".join(extras), d)
+}
+
+# Override the contents of specific packages
+FILES_boost-serialization = "${libdir}/libboost_serialization*.so* \
+	${libdir}/libboost_wserialization*.so*"
+FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so \
+	${libdir}/libboost_unit_test_framework*.so*"
+
+# -dev last to pick up the remaining stuff
+PACKAGES += "${PN}-dev"
+FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a"
+
+# "boost" is a metapackage which pulls in all boost librabries
+PACKAGES += "${PN}"
+RRECOMMENDS_${PN} += "${BOOST_PACKAGES}"
+
diff --git a/recipes/boost/boost_1.40.0.bb b/recipes/boost/boost_1.40.0.bb
new file mode 100644
index 0000000000..5db3b4a301
--- /dev/null
+++ b/recipes/boost/boost_1.40.0.bb
@@ -0,0 +1,10 @@
+require boost-14x.inc
+
+PR = "r0"
+
+SRC_URI = "http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz \
+           file://uclibc.patch;patch=1 \
+          "
+S = "${WORKDIR}/boost-1.40.0.cmake2"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/boost/files/uclibc.patch b/recipes/boost/files/uclibc.patch
new file mode 100644
index 0000000000..738b8b947d
--- /dev/null
+++ b/recipes/boost/files/uclibc.patch
@@ -0,0 +1,13 @@
+Index: boost-1.40.0.cmake2/libs/thread/src/pthread/thread.cpp
+===================================================================
+--- boost-1.40.0.cmake2.orig/libs/thread/src/pthread/thread.cpp	2009-11-03 21:33:21.392444361 +0100
++++ boost-1.40.0.cmake2/libs/thread/src/pthread/thread.cpp	2009-11-03 21:36:04.748684550 +0100
+@@ -390,7 +390,7 @@
+     {
+ #if defined(PTW32_VERSION) || defined(__hpux)
+         return pthread_num_processors_np();
+-#elif defined(__linux__)
++#elif defined(__linux__) && !defined(__UCLIBC__)
+         return get_nprocs();
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+         int count;
diff --git a/recipes/connman/connman_0.46.bb b/recipes/connman/connman_0.46.bb
new file mode 100644
index 0000000000..26b7b82798
--- /dev/null
+++ b/recipes/connman/connman_0.46.bb
@@ -0,0 +1,37 @@
+require connman.inc
+
+PR = "r1"
+
+EXTRA_OECONF += "\
+  --disable-gtk-doc \
+  --enable-debug \
+  --enable-threads \
+  --enable-loopback \
+  --enable-ethernet \
+  --enable-wifi \
+  --disable-wimax \
+  --enable-bluetooth \
+  --enable-udhcp \
+  --enable-dhclient \
+  --enable-resolvconf \
+  --enable-dnsproxy \
+  --disable-novatel \
+  --disable-huawei \
+  --disable-hso \
+  --enable-ppp \
+# needs udev >= 129
+  --disable-udev \
+  --disable-polkit \
+  --enable-client \
+  --enable-fake \
+#  --with-udhcpc=PROGRAM \
+#  --with-dhclient=PROGRAM \
+#  --with-resolvconf=PROGRAM \
+#  --with-pppd=PROGRAM \
+"
+
+SRC_URI  = "\
+  http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \
+  file://connman \
+"
+
diff --git a/recipes/e17/expedite_svn.bb b/recipes/e17/expedite_svn.bb
index c4dfa5afed..2bcc6d9877 100644
--- a/recipes/e17/expedite_svn.bb
+++ b/recipes/e17/expedite_svn.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
 DEPENDS = "eet evas"
-RDEPENDS = "evas-engine-buffer evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-loader-png"
+RDEPENDS = "expedite-themes evas-engine-buffer evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-loader-png"
 LICENSE = "MIT BSD"
 PV = "0.6.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r3"
 
 inherit e
 
@@ -13,7 +13,6 @@ EXTRA_OECONF = "\
   --enable-simple-x11 \
 \
   --disable-opengl-glew \
-  --disable-opengl-x11 \
   --enable-software-x11 \
   --enable-xrender-x11 \
   --enable-software-16-x11 \
diff --git a/recipes/efl1/evas.inc b/recipes/efl1/evas.inc
index 55774ee7ad..833d38f240 100644
--- a/recipes/efl1/evas.inc
+++ b/recipes/efl1/evas.inc
@@ -29,12 +29,12 @@ do_install_append() {
     find "${D}" -name .debug -type d -exec rm -rf {} \;
 }
 
-FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
-FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
+FILES_${SRCNAME}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la"
+FILES_${SRCNAME}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
 
 PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-*"
 
-RRECOMMENDS_${PN} = "\
+RRECOMMENDS_${SRCNAME} = "\
   evas-engine-buffer \
   evas-engine-fb \
   evas-engine-software-generic \
@@ -51,9 +51,9 @@ RRECOMMENDS_${PN} = "\
 # Some upgrade path tweaking
 AUTO_LIBNAME_PKGS = ""
 
-RREPLACES_${PN} = "libevas-ver-pre-svn-00-0 libevas-ver-pre-svn-01-0"
+RREPLACES_${SRCNAME} = "libevas-ver-pre-svn-00-0 libevas-ver-pre-svn-01-0"
 
-RREPLACES_${PN}-tests = "libevas-ver-pre-svn-00-tests libevas-ver-pre-svn-01-tests"
+RREPLACES_${SRCNAME}-tests = "libevas-ver-pre-svn-00-tests libevas-ver-pre-svn-01-tests"
 
 RREPLACES_evas-loader-pmaps = "liblibevas-ver-pre-svn-00-loader-pmaps libevas-ver-pre-svn-00-loader-pmaps "
 RREPLACES_evas-loader-eet = "liblibevas-ver-pre-svn-00-loader-eet libevas-ver-pre-svn-00-loader-eet "
@@ -79,6 +79,6 @@ RREPLACES_evas-engine-software-x11 = "liblibevas-ver-pre-svn-00-engine-software-
 
 
 # disabling this, since (due to OE bugs) it drags in whole Gtk+
-#RRECOMMENDS_${PN} += "\
+#RRECOMMENDS_${SRCNAME} += "\
 #  libevas-loader-svg \
 #"
diff --git a/recipes/efl1/evas_svn.bb b/recipes/efl1/evas_svn.bb
index f84bd48f7a..21779818ca 100644
--- a/recipes/efl1/evas_svn.bb
+++ b/recipes/efl1/evas_svn.bb
@@ -1,5 +1,8 @@
 require evas.inc
-PR = "r3"
+PR = "r4"
+
+EVAS_CPU_TWEAKS = ""
+EVAS_CPU_TWEAKS_armv7a = "--enable-cpu-neon"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
@@ -60,4 +63,19 @@ EXTRA_OECONF = "\
 		--enable-convert-32-rgb-rot-0	\
 		--enable-convert-32-rgb-rot-90	\
 		--disable-convert-32-rgb-rot-180 \
-		--enable-convert-32-rgb-rot-270"
+		--enable-convert-32-rgb-rot-270 \
+		${EVAS_CPU_TWEAKS}"
+
+
+# either sgx or 6410 atm
+GLES ?= "sgx"
+
+# This is a hack to get openGL|ES 2.x support enabled for people that have the SDK headers in staging.
+# We put this in the main recipe, since it will just not build the gl stuff when the headers are missing
+
+# If the above sentence confuse you: everything is built and configured as before if you don't have the SDK
+
+EXTRA_OECONF += "\
+        --enable-gl-x11 --enable-gl-flavor-gles --enable-gles-variety-${GLES} \
+"
+
diff --git a/recipes/eject/eject_2.1.5.bb b/recipes/eject/eject_2.1.5.bb
index 6d53aee9a7..f90f8e6993 100644
--- a/recipes/eject/eject_2.1.5.bb
+++ b/recipes/eject/eject_2.1.5.bb
@@ -1,9 +1,10 @@
 DESCRIPTION = "Eject allows removable media (typically a CD-ROM, floppy disk, tape, or JAZ or ZIP disk) to be ejected under software control."
+HOMEPAGE = "http://eject.sourceforge.net/"
 LICENSE = "GPLv2"
 
 inherit autotools gettext
 
-SRC_URI = "http://ca.geocities.com/jefftranter@rogers.com/eject-${PV}.tar.gz"
+SRC_URI = "http://sources.openembedded.org/eject-2.1.5.tar.gz"
 
 S = "${WORKDIR}/${PN}"
 
diff --git a/recipes/gnome-mplayer/gecko-mediaplayer/gecko-mplayer-svn.diff b/recipes/gnome-mplayer/gecko-mediaplayer/gecko-mplayer-svn.diff
new file mode 100644
index 0000000000..929d02540a
--- /dev/null
+++ b/recipes/gnome-mplayer/gecko-mediaplayer/gecko-mplayer-svn.diff
@@ -0,0 +1,480 @@
+Index: configure
+===================================================================
+--- configure	(revision 328)
++++ configure	(working copy)
+@@ -639,6 +639,7 @@
+ am__EXEEXT_TRUE
+ LTLIBOBJS
+ LIBOBJS
++plugindir
+ GIO_DEFINES
+ GIO_LIBS
+ GIO_CFLAGS
+@@ -775,6 +776,7 @@
+ enable_schemas_install
+ with_gconf
+ with_gio
++with_plugin_dir
+ enable_caching
+ '
+       ac_precious_vars='build_alias
+@@ -1444,6 +1446,7 @@
+                           Directory for installing schema files.
+   --with-gconf            Use Gconf to store preferences
+   --with-gio              Use GIO for file I/O
++  --with-plugin-dir=dir   Directory where plugins are stored
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -9640,6 +9643,16 @@
+ fi
+ 
+ 
++
++# Check whether --with-plugin_dir was given.
++if test "${with_plugin_dir+set}" = set; then
++  withval=$with_plugin_dir; plugindir=$withval
++else
++  plugindir='$(libdir)/mozilla/plugins'
++fi
++
++
++
+ # Check whether --enable-caching was given.
+ if test "${enable_caching+set}" = set; then
+   enableval=$enable_caching; usecache=$enableval
+Index: Makefile.in
+===================================================================
+--- Makefile.in	(revision 328)
++++ Makefile.in	(working copy)
+@@ -239,6 +239,7 @@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ pdfdir = @pdfdir@
++plugindir = @plugindir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 328)
++++ configure.in	(working copy)
+@@ -114,6 +114,13 @@
+     AC_SUBST(GIO_LIBS)
+     ])
+ 
++AC_ARG_WITH([plugin_dir],
++    [AS_HELP_STRING([--with-plugin-dir=dir],
++        [Directory where plugins are stored])],
++        [plugindir=$withval],
++        [plugindir='$(libdir)/mozilla/plugins'])
++AC_SUBST(plugindir)
++
+ AC_ARG_ENABLE(caching,
+ 	AC_HELP_STRING([--disable-caching],[Disable caching of remote media to local storage]),
+ 	[usecache=$enableval],[usecache=yes])
+Index: src/plugin.cpp
+===================================================================
+--- src/plugin.cpp	(revision 328)
++++ src/plugin.cpp	(working copy)
+@@ -42,9 +42,9 @@
+ #include "plugin_setup.h"
+ #include "plugin_types.h"
+ #include "plugin_dbus.h"
+-#include "nsIPrefBranch.h"
+-#include "nsIPrefService.h"
+-#include "nsIServiceManager.h"
++#include <nsIPrefBranch.h>
++#include <nsIPrefService.h>
++#include <nsIServiceManager.h>
+ 
+ nsIPrefBranch *prefBranch = NULL;
+ nsIPrefService *prefService = NULL;
+@@ -170,9 +170,9 @@
+ {
+     gchar *jscript;
+ 
+-    jscript = g_strdup_printf("javascript:obj=document.getElementById('%s');"
+-                              "e=document.createEvent('Events');"
+-                              "e.initEvent('%s',true,true);" "obj.dispatchEvent(e);", id, event);
++    jscript = g_strdup_printf("javascript:obj_gmp=document.getElementById('%s');"
++                              "e_gmp=document.createEvent('Events');"
++                              "e_gmp.initEvent('%s',true,true);" "obj_gmp.dispatchEvent(e_gmp);", id, event);
+     NPN_GetURL(mInstance, jscript, NULL);
+     g_free(jscript);
+ }
+@@ -259,6 +259,7 @@
+ console(NULL),
+ controls(NULL),
+ user_agent(NULL),
++player_backend(NULL),
+ disable_context_menu(FALSE),
+ disable_fullscreen(FALSE),
+ post_dom_events(FALSE),
+@@ -354,6 +355,8 @@
+     store = gm_pref_store_new("gecko-mediaplayer");
+     if (store != NULL) {
+         debug_level = gm_pref_store_get_int(store, DEBUG_LEVEL);
++        player_backend = gm_pref_store_get_string(store, PLAYER_BACKEND);
++        printf("Using player backend of '%s'\n",player_backend);
+         gm_pref_store_free(store);
+     }
+ 
+@@ -458,10 +461,16 @@
+     }
+ 
+     if (!player_launched && mWidth > 0 && mHeight > 0) {
+-        app_name = g_find_program_in_path("gnome-mplayer");
+-        if (app_name == NULL)
+-            app_name = g_find_program_in_path("gnome-mplayer-minimal");
+-
++        app_name = NULL;
++        if (player_backend != NULL) {
++            app_name = g_find_program_in_path(player_backend);
++        }
++        if (app_name == NULL) {
++            app_name = g_find_program_in_path("gnome-mplayer");