Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.org/openembedded into org.openembedded.dev

32 files changed, 777 insertions, 21 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index e797fd5c06..bd3f7aebe3 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -11342,6 +11342,10 @@ sha256=12205d01cb99900ed6f936a09ac31b5849f8a7ff3c9a93e5857a76dc3e30788a
 md5=19bc6cc07951b3382d1ac8525b20e83f
 sha256=831f450a0fa18c881b00ec50e8916ed66ca0fecb53cd1939f0abcc02930f9847
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.17.tar.bz2]
+md5=833546cd2b8bbf86b8ed083b00897918
+sha256=4f41fbd325270416c9f55d900e470482a7d1e7efbdbb725ed03a085dec307ad6
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.2.tar.bz2]
 md5=03d3d0b5f19014fe0065234a3ea65ee6
 sha256=dd92993d08930cca071893b5d3f5cb40a4498f3ddaf12da98c0bbe8c27605e81
@@ -13494,6 +13498,10 @@ sha256=afe5bddd14c06e1e9350742c5569511039ceaf82a2437b89a62c7ae8c82df245
 md5=f2a893efdc2712b70ee8fbb65da2a70e
 sha256=f219303e60f81b3cf6206b6c1851bd42069bd018ed18482ab04dded0b4339f8a
 
+[http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28-20094803.3+0m5.diff.gz]
+md5=fdd13af46cbaf8594b9fc3d82070aecc
+sha256=78ab82b0d6647d196fe3f6185a743da4b1846730668b078beb814c717fdd0bb5
+
 [http://www.kerneloops.org/download/kerneloops-0.11.tar.gz]
 md5=a0daa9437f0638912a91afe66f51545b
 sha256=2f23a1a2f1b928b2ad44f13a98c704c3d7abd5e3c7157f6a8915acc74c8dcd71
@@ -17498,10 +17506,6 @@ sha256=877af8ed89e56af004bb0662c1a9cfc785b40c602f71a8bf81521991026cf2f0
 md5=5fc8e9f43fa44ac29ddf9a9980af57d8
 sha256=877af8ed89e56af004bb0662c1a9cfc785b40c602f71a8bf81521991026cf2f0
 
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.8.1.tar.bz2]
-md5=f00fd1b5a80f52baf9d1d83acddfa325
-sha256=910f4af05f40ed9a6ab3bc8ccf7ca77365fb7bfe9b5dcfa7ff316e03b354d4ff
-
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2]
 md5=f00fd1b5a80f52baf9d1d83acddfa325
 sha256=1fa39c202efe168bfeb0ddd74c8e4814f77da7dc78993e47826bad9173b95808
@@ -17742,6 +17746,10 @@ sha256=0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
 md5=260551284ac224c3a43c4adac7df4879
 sha256=5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
 
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.8.1.tar.bz2]
+md5=f00fd1b5a80f52baf9d1d83acddfa325
+sha256=910f4af05f40ed9a6ab3bc8ccf7ca77365fb7bfe9b5dcfa7ff316e03b354d4ff
+
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
 md5=e921200f074ca97184e150ef5a4af825
 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
@@ -21634,6 +21642,10 @@ sha256=ed3ec802ccb3585bf0a57724471fa24b98cce5caef8f35d6c26fed7c9213168d
 md5=79782ebd9672c39dd7303d7442756556
 sha256=ad9e0c07e709e9e9a60abe0b15a61482645f3aa64b30fa72c27f1bd13d7aa84d
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.44.bz2]
+md5=da09ddd041a3fb35d236d37ec6de88e9
+sha256=a63144608d5fa72b23151022d9d716e9ebc5b428e6307535481a4f48adb2cfe8
+
 [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.8.bz2]
 md5=ec23e3dce22b23ca681199fe515f10fb
 sha256=31c35db09289c6e0436a258745d7180e0cd8f567949f27b3dab5a57a3664ed2f
@@ -21702,6 +21714,10 @@ sha256=0f32fb48b0c13991bc1a29f378e6435ff3d56408e8952e790ad25597e8870540
 md5=43977a0a264dd7d173b6ef122c62fb20
 sha256=34586de4c7d1517842dfe32a8621f945cd6b8ee55096f8f053a66accd3d17a41
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.12.bz2]
+md5=ce365b2c72ad0855e1746a80b7abdade
+sha256=7dea28a76ca6362ad949ec1bf45fada4a6fc888b40360d90d2f56f01d18f72ae
+
 [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.3.bz2]
 md5=24d60ad6645211e2c08dc1c1c578b249
 sha256=ed167dcbdf52c2563a30e7c81a0f2b3d79eb04acc5728e6d484166a4fe8a39e4
@@ -21734,6 +21750,10 @@ sha256=26f6fad3259ad6d2356cfa04462ace5fd3b5cecec410bbcefe7d5f6dbeb00baa
 md5=924b7aa0fcd6e54c12ecc9b3c3082f59
 sha256=d207f4217c4b3fef9c5a19620b6ca90dbd9b9583ed9c686b5636eec973a7cc60
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.32.5.bz2]
+md5=49e6bc73c7a7f690fe7ddf09fe2b5d06
+sha256=b4d0d667db5094fd430ed58955f4f9ed71d278d5ce70e63d287c53f8db028ac3
+
 [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
 md5=d6249654087f0bcafaa860ac573316a4
 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
@@ -23702,6 +23722,10 @@ sha256=9cfe0418699e231587182b441c8f6ca68f109059c62bfc8dd9daeafb8277d211
 md5=2a7b5126f2450d8525af355fc4c12ad6
 sha256=55259c813324f6383cbd441aa2f23e01c320b6d63fbe3b5d52a7715055d28589
 
+[ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-4.6.1.tar.gz]
+md5=0542a4be6425451ab5f668c6899cac36
+sha256=4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5
+
 [ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.5.tar.bz2]
 md5=05d04688c0c0230ed54e89102d689ca4
 sha256=aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index d881202b09..960169afbd 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -123,7 +123,7 @@ PREFERRED_VERSION_bvi ?= "1.3.1"
 PREFERRED_VERSION_bwmon ?= "1.3"
 PREFERRED_VERSION_bzflag ?= "1.10.6.20040515"
 PREFERRED_VERSION_bzflag-server ?= "1.10.6.20040515"
-PREFERRED_VERSION_bzip2 ?= "1.0.2"
+PREFERRED_VERSION_bzip2 ?= "1.0.5"
 PREFERRED_VERSION_cacao-cldc ?= "0.98"
 PREFERRED_VERSION_cacaoh-cldc-native ?= "0.98"
 PREFERRED_VERSION_cairo ?= "1.6.4"
@@ -1429,7 +1429,7 @@ PREFERRED_VERSION_phoneserver ?= "1.0"
 PREFERRED_VERSION_php ?= "5.2.0"
 PREFERRED_VERSION_php-native ?= "5.2.0"
 PREFERRED_VERSION_picocom ?= "1.4"
-PREFERRED_VERSION_pidgin ?= "2.5.8"
+PREFERRED_VERSION_pidgin ?= "2.6.5"
 PREFERRED_VERSION_pine ?= "4.64"
 PREFERRED_VERSION_pipeman ?= "1.0.0"
 PREFERRED_VERSION_pipepanic ?= "0.1.1"
diff --git a/recipes/alsa/alsa-state/at91sam9g45ek/asound.conf b/recipes/alsa/alsa-state/at91sam9g45ek/asound.conf
new file mode 100644
index 0000000000..fa98593515
--- /dev/null
+++ b/recipes/alsa/alsa-state/at91sam9g45ek/asound.conf
@@ -0,0 +1,2 @@
+pcm.!default {  type hw  card 0  }
+ctl.!default {  type hw  card 0  }
diff --git a/recipes/alsa/alsa-state/at91sam9g45ek/asound.state b/recipes/alsa/alsa-state/at91sam9g45ek/asound.state
new file mode 100644
index 0000000000..ee646a1341
--- /dev/null
+++ b/recipes/alsa/alsa-state/at91sam9g45ek/asound.state
@@ -0,0 +1,283 @@
+state.AC97 {
+	control.1 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Master Playback Switch'
+		value.0 true
+		value.1 true
+	}
+	control.2 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin -4650
+		comment.dbmax 0
+		iface MIXER
+		name 'Master Playback Volume'
+		value.0 22
+		value.1 22
+	}
+	control.3 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Headphone Playback Switch'
+		value.0 true
+		value.1 true
+	}
+	control.4 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin -4650
+		comment.dbmax 0
+		iface MIXER
+		name 'Headphone Playback Volume'
+		value.0 22
+		value.1 22
+	}
+	control.5 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Master Mono Playback Switch'
+		value false
+	}
+	control.6 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 31'
+		comment.dbmin -4650
+		comment.dbmax 0
+		iface MIXER
+		name 'Master Mono Playback Volume'
+		value 0
+	}
+	control.7 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Phone Playback Switch'
+		value false
+	}
+	control.8 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 31'
+		comment.dbmin -3450
+		comment.dbmax 1200
+		iface MIXER
+		name 'Phone Playback Volume'
+		value 0
+	}
+	control.9 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Mic Playback Switch'
+		value false
+	}
+	control.10 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 31'
+		comment.dbmin -3450
+		comment.dbmax 1200
+		iface MIXER
+		name 'Mic Playback Volume'
+		value 0
+	}
+	control.11 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Mic Boost (+20dB)'
+		value false
+	}
+	control.12 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Line Playback Switch'
+		value.0 false
+		value.1 false
+	}
+	control.13 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin -3450
+		comment.dbmax 1200
+		iface MIXER
+		name 'Line Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.14 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'CD Playback Switch'
+		value.0 false
+		value.1 false
+	}
+	control.15 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin -3450
+		comment.dbmax 1200
+		iface MIXER
+		name 'CD Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.16 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Aux Playback Switch'
+		value.0 false
+		value.1 false
+	}
+	control.17 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin -3450
+		comment.dbmax 1200
+		iface MIXER
+		name 'Aux Playback Volume'
+		value.0 0
+		value.1 0
+	}
+	control.18 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'PCM Playback Switch'
+		value.0 true
+		value.1 true
+	}
+	control.19 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 31'
+		comment.dbmin -3450
+		comment.dbmax 1200
+		iface MIXER
+		name 'PCM Playback Volume'
+		value.0 22
+		value.1 22
+	}
+	control.20 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 2
+		comment.item.0 Mic
+		comment.item.1 CD
+		comment.item.2 Video
+		comment.item.3 Aux
+		comment.item.4 Line
+		comment.item.5 Mix
+		comment.item.6 'Mix Mono'
+		comment.item.7 Phone
+		iface MIXER
+		name 'Capture Source'
+		value.0 Mic
+		value.1 Mic
+	}
+	control.21 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Capture Switch'
+		value.0 true
+		value.1 true
+	}
+	control.22 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 15'
+		comment.dbmin 0
+		comment.dbmax 2250
+		iface MIXER
+		name 'Capture Volume'
+		value.0 11
+		value.1 11
+	}
+	control.23 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Mix
+		comment.item.1 Mic
+		iface MIXER
+		name 'Mono Output Select'
+		value Mix
+	}
+	control.24 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Mic1
+		comment.item.1 Mic2
+		iface MIXER
+		name 'Mic Select'
+		value Mic1
+	}
+	control.25 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Stereo Mic'
+		value false
+	}
+	control.26 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Headphone Jack Sense'
+		value false
+	}
+	control.27 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Line Jack Sense'
+		value false
+	}
+	control.28 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'External Amplifier'
+		value true
+	}
+}
diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb
index 926fcf60a8..c4fbdf3697 100644
--- a/recipes/freesmartphone/frameworkd_git.bb
+++ b/recipes/freesmartphone/frameworkd_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.9.5.9+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 inherit distutils update-rc.d
 
@@ -30,6 +30,12 @@ do_install_append() {
 	install -m 0644 ${WORKDIR}/frameworkd.conf ${D}${sysconfdir}
 }
 
+pkg_postinst_${PN} () {
+	echo "NOTE: if you have old contacts without field types and the"
+	echo "      tel: prefix instead please use the remove-tel script"
+	echo "      from http://wiki.shr-project.org/trac/wiki/new-opimd"
+}
+
 RDEPENDS_${PN} += "\
   fsousaged \
 "
diff --git a/recipes/gstreamer/gst-plugins-good/flvdemux-ecma.diff b/recipes/gstreamer/gst-plugins-good/flvdemux-ecma.diff
new file mode 100644
index 0000000000..6def2e07fd
--- /dev/null
+++ b/recipes/gstreamer/gst-plugins-good/flvdemux-ecma.diff
@@ -0,0 +1,26 @@
+From dd82612340001e7ff821725ac257a0a36ab1fea7 Mon Sep 17 00:00:00 2001
+From: Jan Urbański <wulczer@wulczer.org>
+Date: Mon, 09 Nov 2009 11:17:34 +0000
+Subject: flvmux: properly finish the ECMA array
+
+The ECMA array with the file index was missing a mandatory end marker.
+Fixes bug #601242.
+---
+diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c
+index 89e8279..e1cb143 100644
+--- a/gst/flv/gstflvmux.c
++++ b/gst/flv/gstflvmux.c
+@@ -1060,6 +1060,11 @@ gst_flv_mux_write_index (GstFlvMux * mux)
+   }
+   script_tag = gst_buffer_join (script_tag, tmp);
+ 
++  tmp = gst_buffer_new_and_alloc (3);
++  data = GST_BUFFER_DATA (tmp);
++  GST_WRITE_UINT24_BE (data, 9);        /* finish the ECMA array */
++  script_tag = gst_buffer_join (script_tag, tmp);
++
+   tmp = gst_buffer_new_and_alloc (4);
+   data = GST_BUFFER_DATA (tmp);
+   GST_WRITE_UINT32_BE (data, GST_BUFFER_SIZE (script_tag));
+--
+cgit v0.8.3-6-g21f6
diff --git a/recipes/gstreamer/gst-plugins-good_0.10.15.bb b/recipes/gstreamer/gst-plugins-good_0.10.15.bb
index 57ff59ba99..600db6ec95 100644
--- a/recipes/gstreamer/gst-plugins-good_0.10.15.bb
+++ b/recipes/gstreamer/gst-plugins-good_0.10.15.bb
@@ -4,7 +4,6 @@ PR = "r6"
 
 SRC_URI += "file://fix-unit-scale-asseration.patch;patch=1"
 
-OE_ALLOW_INSECURE_DOWNLOADS = "1"
 inherit gconf 
 
 DEPENDS += "libsoup-2.4 flac gst-plugins-base openssl popt esound"
diff --git a/recipes/gstreamer/gst-plugins-good_0.10.17.bb b/recipes/gstreamer/gst-plugins-good_0.10.17.bb
new file mode 100644
index 0000000000..78191f9715
--- /dev/null
+++ b/recipes/gstreamer/gst-plugins-good_0.10.17.bb
@@ -0,0 +1,14 @@
+require gst-plugins.inc
+
+SRC_URI += "file://flvdemux-ecma.diff;patch=1 \
+"
+
+PR = "r1"
+
+inherit gconf 
+
+DEPENDS += "libsoup-2.4 flac gst-plugins-base openssl popt esound"
+
+PACKAGES =+ "gst-plugin-gconfelements"
+FILES_gst-plugin-gconfelements += "${sysconfdir}/gconf"
+
diff --git a/recipes/linux/linux_2.6.27.bb b/recipes/linux/linux_2.6.27.bb
index 02f32dc46c..bb7b1f347c 100644
--- a/recipes/linux/linux_2.6.27.bb
+++ b/recipes/linux/linux_2.6.27.bb
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE_progear = "1"
 DEFAULT_PREFERENCE_simpad = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.42.bz2;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.44.bz2;patch=1 \
            file://defconfig "
 
 SRC_URI_append_boc01 = "\
diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb
index 3f16c0497a..532f08a0aa 100644
--- a/recipes/linux/linux_2.6.31.bb
+++ b/recipes/linux/linux_2.6.31.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r9"
+PR = "r10"
 
 S = "${WORKDIR}/linux-${PV}"
 
@@ -14,7 +14,7 @@ DEFAULT_PREFERENCE_qemux86 = "1"
 DEFAULT_PREFERENCE_iei-nanogx-466 = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.9.bz2;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.12.bz2;patch=1 \
            file://defconfig"
 
 SRC_URI += "file://0001-Squashfs-move-zlib-decompression-wrapper-code-into.patch;patch=1 \
diff --git a/recipes/linux/linux_2.6.32.bb b/recipes/linux/linux_2.6.32.bb
index 46413713e6..560ff42a67 100644
--- a/recipes/linux/linux_2.6.32.bb
+++ b/recipes/linux/linux_2.6.32.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r4"
+PR = "r5"
 
 S = "${WORKDIR}/linux-${PV}"
 
@@ -22,7 +22,7 @@ DEFAULT_PREFERENCE_jornada6xx = "-1"
 DEFAULT_PREFERENCE_jornada7xx = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \
-           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.2.bz2;patch=1 \
+           ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.5.bz2;patch=1 \
            file://defconfig"
 
 SRC_URI[kernel.md5sum] = "260551284ac224c3a43c4adac7df4879"
diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb
index 3d5e9d9dbd..263dc9a924 100644
--- a/recipes/mplayer/mplayer_svn.bb
+++ b/recipes/mplayer/mplayer_svn.bb
@@ -15,7 +15,7 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \
 	   file://fix-addrinfo.patch;patch=1;maxrev=30302 \
 "
 
-SRCREV = "30395"
+SRCREV = "30432"
 SRC_URI_append_armv7a = " \
 		file://omapfb.patch;patch=1 \
 	   file://vo_omapfb.c \
diff --git a/recipes/qt4/qt-4.6.1.inc b/recipes/qt4/qt-4.6.1.inc
new file mode 100644
index 0000000000..274deea426
--- /dev/null
+++ b/recipes/qt4/qt-4.6.1.inc
@@ -0,0 +1,47 @@
+DEFAULT_PREFERENCE = "-1"
+
+FILESPATHPKG .= ":qt-${PV}"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://0001-cross-compile.patch;patch=1 \
+           file://0002-fix-resinit-declaration.patch;patch=1 \
+           file://0004-no-qmake.patch;patch=1 \
+           file://0006-freetype-host-includes.patch;patch=1 \
+           file://0008-qt-lib-infix.patch;patch=1 \
+           file://0009-support-2bpp.patch;patch=1 \
+           file://0010-no-simpledecoration-example.patch;patch=1 \
+           file://fix-config-tests.patch;patch=1 \
+           file://g++.conf \
+           file://linux.conf \
+           "
+
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+do_configure_prepend() {
+    sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
+    sed -i \
+    -e /QMAKE_MOC\ /d \
+    -e /QMAKE_UIC\ /d \
+    -e /QMAKE_UIC3\ /d \
+    -e /QMAKE_RCC\ /d \
+    ${S}/configure
+}
+
+QT_GLFLAGS ?= ""
+QT_CONFIG_FLAGS += "${QT_GLFLAGS}"
+
+do_compile() {
+    unset CFLAGS CXXFLAGS
+    oe_runmake ${EXTRA_ENV}
+}
+
+do_install_append() {
+	install -d ${D}${bindir}
+	for i in rcc uic moc ; do
+		install -m 0755 ${S}/bin/$i ${D}${bindir}/
+	done
+}
+
+LICENSE = "LGPLv2.1 GPLv3"
+SRC_URI += " \
+            file://hack-out-pg_config.patch;patch=1"
diff --git a/recipes/qt4/qt4-embedded-4.6.1/0006-freetype-host-includes.patch b/recipes/qt4/qt4-embedded-4.6.1/0006-freetype-host-includes.patch
new file mode 100644
index 0000000000..987c425138
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-4.6.1/0006-freetype-host-includes.patch
@@ -0,0 +1,20 @@
+From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker@klever.net>
+Date: Mon, 4 Jun 2007 14:48:50 +0200
+Subject: [PATCH] freetype host includes
+
+---
+ config.tests/unix/freetype/freetype.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri
+===================================================================
+--- qt-embedded-linux-opensource-src-4.5.0.orig/config.tests/unix/freetype/freetype.pri	2009-02-25 22:32:32.000000000 +0100
++++ qt-embedded-linux-opensource-src-4.5.0/config.tests/unix/freetype/freetype.pri	2009-03-26 17:14:16.000000000 +0100
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     # LSB doesn't allow using headers from /include or /usr/include
+     linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
diff --git a/recipes/qt4/qt4-embedded-4.6.1/0008-qt-lib-infix.patch b/recipes/qt4/qt4-embedded-4.6.1/0008-qt-lib-infix.patch
new file mode 100644
index 0000000000..61e60a0eb6
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-4.6.1/0008-qt-lib-infix.patch
@@ -0,0 +1,32 @@
+--- /tmp/uitools.prf	2009-12-01 18:38:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf	2009-12-01 18:58:16.000000000 +0100
+@@ -3,11 +3,11 @@
+ 
+ # Include the correct version of the UiLoader library
+ symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib
+-else: QTUITOOLS_LINKAGE = -lQtUiTools
++else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
+ 
+ CONFIG(debug, debug|release) {
+-    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
+-    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
++    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
++    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
+ }
+ LIBS += $$QTUITOOLS_LINKAGE
+ 
+--- /tmp/uitools.pro	2009-12-01 18:40:28.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro	2009-12-01 18:59:18.000000000 +0100
+@@ -1,5 +1,5 @@
+ TEMPLATE = lib
+-TARGET = $$qtLibraryTarget(QtUiTools)
++TARGET = QtUiTools
+ QT += xml
+ CONFIG += qt staticlib
+ DESTDIR = ../../../../lib
+@@ -43,3 +43,5 @@
+    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+    QMAKE_PKGCONFIG_REQUIRES += QtXml
+ }
++
++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/recipes/qt4/qt4-embedded-4.6.1/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-embedded-4.6.1/0010-no-simpledecoration-example.patch
new file mode 100644
index 0000000000..fce5bba938
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-4.6.1/0010-no-simpledecoration-example.patch
@@ -0,0 +1,11 @@
+--- /tmp/qws.pro	2009-12-10 19:30:08.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro	2009-12-10 19:30:21.000000000 +0100
+@@ -1,7 +1,7 @@
+ TEMPLATE      = subdirs
+ # no /dev/fbX
+ !qnx:!vxworks:SUBDIRS = framebuffer
+-SUBDIRS      += mousecalibration simpledecoration
++SUBDIRS      += mousecalibration
+ 
+ # install
+ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
diff --git a/recipes/qt4/qt4-embedded-4.6.1/linux.conf b/recipes/qt4/qt4-embedded-4.6.1/linux.conf
new file mode 100644
index 0000000000..68ae80b929
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-4.6.1/linux.conf
@@ -0,0 +1,54 @@
+#
+# qmake configuration for common linux
+#
+
+QMAKE_CFLAGS_THREAD	+= -D_REENTRANT
+QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
+
+QMAKE_INCDIR          =
+QMAKE_LIBDIR          =
+QMAKE_INCDIR_X11      =
+QMAKE_LIBDIR_X11      =
+QMAKE_INCDIR_QT       = $(OE_QMAKE_INCDIR_QT)
+QMAKE_LIBDIR_QT       = $(OE_QMAKE_LIBDIR_QT)
+QMAKE_INCDIR_OPENGL   =
+QMAKE_LIBDIR_OPENGL   =
+
+
+QMAKE_LIBS            = -Wl,-rpath-link,SEDME/lib -lglib-2.0
+QMAKE_LIBS_DYNLOAD    = -ldl
+QMAKE_LIBS_X11        = $(OE_QMAKE_LIBS_X11)
+QMAKE_LIBS_X11SM      = $(OE_QMAKE_LIBS_X11SM)
+QMAKE_LIBS_NIS        = -lnsl
+QMAKE_LIBS_OPENGL     = -lGLU -lGL
+QMAKE_LIBS_OPENGL_QT  = -lGL
+QMAKE_LIBS_THREAD     = -lpthread
+
+QMAKE_MOC             = $(OE_QMAKE_MOC)
+QMAKE_UIC             = $(OE_QMAKE_UIC)
+QMAKE_UIC3            = $(OE_QMAKE_UIC3)
+QMAKE_RCC             = $(OE_QMAKE_RCC)
+QMAKE_QDBUSCPP2XML    = $(OE_QMAKE_QDBUSCPP2XML)
+QMAKE_QDBUSXML2CPP    = $(OE_QMAKE_QDBUSXML2CPP)
+
+QMAKE_AR              = $(OE_QMAKE_AR) cqs
+QMAKE_OBJCOPY         = ${OBJCOPY}
+QMAKE_RANLIB          =
+
+QMAKE_TAR             = tar -cf
+QMAKE_GZIP            = gzip -9f
+
+QMAKE_COPY            = cp -f
+QMAKE_COPY_FILE       = $(COPY)
+QMAKE_COPY_DIR        = $(COPY) -r
+QMAKE_MOVE            = mv -f
+QMAKE_DEL_FILE        = rm -f
+QMAKE_DEL_DIR         = rmdir
+QMAKE_STRIP           = $(OE_QMAKE_STRIP)
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_CHK_DIR_EXISTS  = test -d
+QMAKE_MKDIR           = mkdir -p
+QMAKE_INSTALL_FILE    = install -m 644 -p
+QMAKE_INSTALL_PROGRAM = install -m 755 -p
+
+include(unix.conf)
diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
index 915dd0734f..7aadafe6a0 100644
--- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb
+++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
@@ -4,7 +4,7 @@ PR = "${INC_PR}.1"
 PROVIDES += "qt4-embedded"
 QT_GLFLAGS = "-opengl es2 -openvg"
 
-require qt-4.6.0.inc
+require qt-4.6.1.inc
 
 
 FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded"
diff --git a/recipes/qt4/qt4-embedded-gles_4.6.1.bb b/recipes/qt4/qt4-embedded-gles_4.6.1.bb
new file mode 100644
index 0000000000..915dd0734f
--- /dev/null
+++ b/recipes/qt4/qt4-embedded-gles_4.6.1.bb
@@ -0,0 +1,14 @@
+require qt4-embedded.inc
+PR = "${INC_PR}.1"
+
+PROVIDES += "qt4-embedded"
+QT_GLFLAGS = "-opengl es2 -openvg"
+
+require qt-4.6.0.inc
+
+
+FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded"
+
+DEPENDS += "virtual/egl"
+
+
diff --git a/recipes/qt4/qt4-embedded_4.6.0.bb b/recipes/qt4/qt4-embedded_4.6.0.bb
index 58fda71ad1..f2c8410c55 100644
--- a/recipes/qt4/qt4-embedded_4.6.0.bb
+++ b/recipes/qt4/qt4-embedded_4.6.0.bb
@@ -2,5 +2,5 @@ require qt4-embedded.inc
 
 PR = "${INC_PR}.0"
 
-require qt-4.6.0.inc
+require qt-4.6.1.inc
 
diff --git a/recipes/qt4/qt4-embedded_4.6.1.bb b/recipes/qt4/qt4-embedded_4.6.1.bb
new file mode 100644
index 0000000000..f2c8410c55
--- /dev/null
+++ b/recipes/qt4/qt4-embedded_4.6.1.bb
@@ -0,0 +1,6 @@
+require qt4-embedded.inc
+
+PR = "${INC_PR}.0"
+
+require qt-4.6.1.inc
+
diff --git a/recipes/qt4/qt4-tools-native_4.6.1.bb b/recipes/qt4/qt4-tools-native_4.6.1.bb
new file mode 100644
index 0000000000..48310b1233
--- /dev/null
+++ b/recipes/qt4/qt4-tools-native_4.6.1.bb
@@ -0,0 +1,15 @@
+DEFAULT_PREFERENCE = "-1"
+
+require qt4-tools-native.inc
+LICENSE = "LGPLv2.1 GPLv3"
+PR = "${INC_PR}.0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://configure-lflags.patch;patch=1 \
+           file://qt-config.patch;patch=1 \
+           file://g++.conf \
+           file://linux.conf"
+
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+TOBUILD := "src/tools/bootstrap ${TOBUILD}"
diff --git a/recipes/qt4/qt4-tools-sdk_4.6.1.bb b/recipes/qt4/qt4-tools-sdk_4.6.1.bb
new file mode 100644
index 0000000000..b74b8a27e0
--- /dev/null
+++ b/recipes/qt4/qt4-tools-sdk_4.6.1.bb
@@ -0,0 +1,74 @@
+DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "zlib-native dbus-native"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "LGPLv2.1 GPLv3"
+
+DEFAULT_PREFERENCE = "-1"
+inherit sdk
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+           file://configure-lflags.patch;patch=1 \
+           file://qt-config.patch;patch=1 \
+           file://g++.conf \
+           file://linux.conf"
+
+S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
+
+
+# FIXME: make it work with "${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-1"
+EXTRA_OECONF = "-prefix ${prefix} \
+                -qt-libjpeg -qt-gif -system-zlib \
+                -no-libjpeg -no-libpng \
+                -no-accessibility \
+                -no-cups \
+                -no-exceptions  \
+                -no-nas-sound \
+                -no-nis \
+                -verbose -release -fast -static \
+                -qt3support \
+                -I${STAGING_DIR_NATIVE}/usr/include \
+                -I${STAGING_DIR_NATIVE}/usr/include/dbus-1.0 \
+                -I${STAGING_DIR_NATIVE}/usr/lib/dbus-1.0/include"
+
+# yank default -e, otherwise we get the following error:
+# moc_qbuffer.cpp: No such file or directory
+EXTRA_OEMAKE = " "
+
+do_configure() {
+   (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+  src/tools/bootstrap \
+  src/tools/moc \
+  src/corelib \
+  src/sql \
+  src/dbus \
+  src/qt3support \
+  src/xml \
+  src/tools/uic \
+  src/tools/rcc \
+  src/network \
+  src/gui \
+  src/tools/uic3 \
+  tools/linguist/lrelease \
+  tools/linguist/lupdate \
+  tools/qdbus \
+"
+
+do_compile() {
+    for i in ${TOBUILD}; do
+        cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+    done
+}
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 bin/qmake ${D}${bindir}/qmake2
+    for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
+        install -m 0755 bin/${i} ${D}${bindir}/${i}4
+    done
+}
+
diff --git a/recipes/qt4/qt4-x11-free-4.6.1/0008-qt-lib-infix.patch b/recipes/qt4/qt4-x11-free-4.6.1/0008-qt-lib-infix.patch
new file mode 100644
index 0000000000..61e60a0eb6
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free-4.6.1/0008-qt-lib-infix.patch
@@ -0,0 +1,32 @@
+--- /tmp/uitools.prf	2009-12-01 18:38:22.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf	2009-12-01 18:58:16.000000000 +0100
+@@ -3,11 +3,11 @@
+ 
+ # Include the correct version of the UiLoader library
+ symbian: QTUITOOLS_LINKAGE = -lQtUiTools.lib
+-else: QTUITOOLS_LINKAGE = -lQtUiTools
++else: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}
+ 
+ CONFIG(debug, debug|release) {
+-    mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug
+-    win32: QTUITOOLS_LINKAGE = -lQtUiToolsd
++    mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug
++    win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d
+ }
+ LIBS += $$QTUITOOLS_LINKAGE
+ 
+--- /tmp/uitools.pro	2009-12-01 18:40:28.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/tools/designer/src/uitools/uitools.pro	2009-12-01 18:59:18.000000000 +0100
+@@ -1,5 +1,5 @@
+ TEMPLATE = lib
+-TARGET = $$qtLibraryTarget(QtUiTools)
++TARGET = QtUiTools
+ QT += xml
+ CONFIG += qt staticlib
+ DESTDIR = ../../../../lib
+@@ -43,3 +43,5 @@
+    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+    QMAKE_PKGCONFIG_REQUIRES += QtXml
+ }
++
++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/recipes/qt4/qt4-x11-free-4.6.1/0010-no-simpledecoration-example.patch b/recipes/qt4/qt4-x11-free-4.6.1/0010-no-simpledecoration-example.patch
new file mode 100644
index 0000000000..fce5bba938
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free-4.6.1/0010-no-simpledecoration-example.patch
@@ -0,0 +1,11 @@
+--- /tmp/qws.pro	2009-12-10 19:30:08.000000000 +0100
++++ qt-everywhere-opensource-src-4.6.0/examples/qws/qws.pro	2009-12-10 19:30:21.000000000 +0100
+@@ -1,7 +1,7 @@
+ TEMPLATE      = subdirs
+ # no /dev/fbX
+ !qnx:!vxworks:SUBDIRS = framebuffer
+-SUBDIRS      += mousecalibration simpledecoration
++SUBDIRS      += mousecalibration
+ 
+ # install
+ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro
diff --git a/recipes/qt4/qt4-x11-free-4.6.1/linux.conf b/recipes/qt4/qt4-x11-free-4.6.1/linux.conf
new file mode 100644
index 0000000000..68ae80b929
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free-4.6.1/linux.conf
@@ -0,0 +1,54 @@
+#
+# qmake configuration for common linux
+#
+
+QMAKE_CFLAGS_THREAD	+= -D_REENTRANT
+QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_THREAD
+
+QMAKE_INCDIR          =
+QMAKE_LIBDIR          =
+QMAKE_INCDIR_X11      =
+QMAKE_LIBDIR_X11      =
+QMAKE_INCDIR_QT       = $(OE_QMAKE_INCDIR_QT)
+QMAKE_LIBDIR_QT       = $(OE_QMAKE_LIBDIR_QT)
+QMAKE_INCDIR_OPENGL   =
+QMAKE_LIBDIR_OPENGL   =
+
+
+QMAKE_LIBS            = -Wl,-rpath-link,SEDME/lib -lglib-2.0
+QMAKE_LIBS_DYNLOAD    = -ldl
+QMAKE_LIBS_X11        = $(OE_QMAKE_LIBS_X11)
+QMAKE_LIBS_X11SM      = $(OE_QMAKE_LIBS_X11SM)
+QMAKE_LIBS_NIS        = -lnsl
+QMAKE_LIBS_OPENGL     = -lGLU -lGL
+QMAKE_LIBS_OPENGL_QT  = -lGL
+QMAKE_LIBS_THREAD     = -lpthread
+
+QMAKE_MOC             = $(OE_QMAKE_MOC)
+QMAKE_UIC             = $(OE_QMAKE_UIC)
+QMAKE_UIC3            = $(OE_QMAKE_UIC3)
+QMAKE_RCC             = $(OE_QMAKE_RCC)
+QMAKE_QDBUSCPP2XML    = $(OE_QMAKE_QDBUSCPP2XML)
+QMAKE_QDBUSXML2CPP    = $(OE_QMAKE_QDBUSXML2CPP)
+
+QMAKE_AR              = $(OE_QMAKE_AR) cqs
+QMAKE_OBJCOPY         = ${OBJCOPY}
+QMAKE_RANLIB          =
+
+QMAKE_TAR             = tar -cf
+QMAKE_GZIP            = gzip -9f
+
+QMAKE_COPY            = cp -f
+QMAKE_COPY_FILE       = $(COPY)
+QMAKE_COPY_DIR        = $(COPY) -r
+QMAKE_MOVE            = mv -f
+QMAKE_DEL_FILE        = rm -f
+QMAKE_DEL_DIR         = rmdir
+QMAKE_STRIP           = $(OE_QMAKE_STRIP)
+QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_CHK_DIR_EXISTS  = test -d
+QMAKE_MKDIR           = mkdir -p
+QMAKE_INSTALL_FILE    = install -m 644 -p
+QMAKE_INSTALL_PROGRAM = install -m 755 -p
+
+include(unix.conf)
diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
index 8d09d89f8d..c25f9050fe 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
+++ b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
@@ -3,7 +3,7 @@ PR = "${INC_PR}.3"
 
 QT_GLFLAGS = "-opengl es2 -openvg"
 
-require qt-4.6.0.inc
+require qt-4.6.1.inc
 
 QT_CONFIG_FLAGS += " \
  -no-embedded \
diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.1.bb b/recipes/qt4/qt4-x11-free-gles_4.6.1.bb
new file mode 100644
index 0000000000..8d09d89f8d
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free-gles_4.6.1.bb
@@ -0,0 +1,18 @@
+require qt4-x11-free.inc
+PR = "${INC_PR}.3"
+
+QT_GLFLAGS = "-opengl es2 -openvg"
+
+require qt-4.6.0.inc
+
+QT_CONFIG_FLAGS += " \
+ -no-embedded \
+ -xrandr \
+ -x11"
+
+FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free"
+
+DEPENDS += "virtual/egl"
+PROVIDES += "qt4-x11-free"
+
+
diff --git a/recipes/qt4/qt4-x11-free_4.6.0.bb b/recipes/qt4/qt4-x11-free_4.6.0.bb
index 685b7add57..c2d8f669cf 100644
--- a/recipes/qt4/qt4-x11-free_4.6.0.bb
+++ b/recipes/qt4/qt4-x11-free_4.6.0.bb
@@ -1,7 +1,7 @@
 require qt4-x11-free.inc
 PR = "${INC_PR}.1"
 
-require qt-4.6.0.inc
+require qt-4.6.1.inc
 
 QT_CONFIG_FLAGS += " \
  -no-embedded \
diff --git a/recipes/qt4/qt4-x11-free_4.6.1.bb b/recipes/qt4/qt4-x11-free_4.6.1.bb
new file mode 100644
index 0000000000..685b7add57
--- /dev/null
+++ b/recipes/qt4/qt4-x11-free_4.6.1.bb
@@ -0,0 +1,11 @@
+require qt4-x11-free.inc
+PR = "${INC_PR}.1"
+
+require qt-4.6.0.inc
+
+QT_CONFIG_FLAGS += " \
+ -no-embedded \
+ -xrandr \
+ -x11"
+
+
diff --git a/recipes/shadow/shadow.inc b/recipes/shadow/shadow.inc
index 68381f0130..9da5845012 100644
--- a/recipes/shadow/shadow.inc
+++ b/recipes/shadow/shadow.inc
@@ -11,7 +11,7 @@ LICENSE = "BSD"
 SECTION = "base"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
-INC_PR = "r8"
+INC_PR = "r9"
 
 # Additional Policy files for PAM
 PAM_SRC_URI = " \
@@ -79,8 +79,8 @@ do_install_append() {
   sed -i 's/MAIL_DIR/#MAIL_DIR/g' ${D}${sysconfdir}/login.defs
   sed -i 's/#MAIL_FILE/MAIL_FILE/g' ${D}${sysconfdir}/login.defs
 
+  mv ${D}${bindir}/passwd ${D}${bindir}/passwd.${PN}
   mv ${D}${sbindir}/chpasswd ${D}${sbindir}/chpasswd.${PN}
-  mv ${D}${bindir}/passwd ${D}${bindir}/chpasswd.${PN}
 
   # Ensure we add a suitable securetty file to the package that has most common embedded TTYs defined.
   install -m 0400 ${WORKDIR}/securetty ${D}${sysconfdir}/securetty 
diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
index 77e0f8df48..0e3bba4f85 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r17"
+PR = "r18"
 
 SRC_URI = "file://xorg.conf"
 
@@ -8,5 +8,8 @@ do_install() {
 	install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
 }
 
+# Set some dependencies to make the confs actually work
+RDEPENDS_omap3 = "xf86-video-omapfb"
+
 CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
 PACKAGE_ARCH = "${MACHINE_ARCH}"