Updates and various fixes

index 5ee4979..d907c55 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7d7044444a7b1b116e8783edcdb44ff4 \
                     file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0"
 
 
-DEPENDS = "virtual/libx11 xmu gconf"
+DEPENDS = "gconf"
 
 SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
 

index 89a154f..ab23bed 100644
@@ -25,6 +25,7 @@ OECMAKE_C_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CPPFLAGS} -DNDEBUG"
 OECMAKE_CXX_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} ${CXXFLAGS} -DNDEBUG"
 
 OECMAKE_RPATH ?= ""
+OECMAKE_PERLNATIVE_DIR ??= ""
 
 cmake_do_generate_toolchain_file() {
 	cat > ${WORKDIR}/toolchain.cmake <<EOF

@@ -41,7 +42,7 @@ set( CMAKE_CXX_FLAGS_RELEASE "${OECMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "CXXFLA
 
 # only search in the paths provided so cmake doesnt pick
 # up libraries and tools from the native build machine
-set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} )
+set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} ${OECMAKE_PERLNATIVE_DIR})
 set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )
 set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
 set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )

index 522344d..2211b72 100644
@@ -1,2 +1,3 @@
 PATH_prepend = "${STAGING_BINDIR_NATIVE}/perl-native:"
 DEPENDS += "perl-native"
+OECMAKE_PERLNATIVE_DIR = "${STAGING_BINDIR_NATIVE}/perl-native"

index 5044917..015065e 100644
@@ -5,6 +5,8 @@ the protocol, improved threading support, and extensibility."
 HOMEPAGE = "http://xcb.freedesktop.org"
 BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB"
 
+BBCLASSEXTEND = "native nativesdk"
+
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 

index 7c06064..7f24b9c 100644
@@ -215,10 +215,6 @@ python () {
         eext = ext.split(':')
         if len(eext) > 1 and eext[0] == 'multilib':
             localdata = bb.data.createCopy(d)
-            overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + eext[1]
-            localdata.setVar("OVERRIDES", overrides)
-            # TEMP: OVERRIDES isn't working right
-            localdata.setVar("DEFAULTTUNE", localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) or "")
             ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or ""
             #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides))
     bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d)

index 85476d6..e5414ff 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "open source processor emulator"
 HOMEPAGE = "http://qemu.org"
 LICENSE = "GPLv2 & LGPLv2.1"
-DEPENDS = "zlib alsa-lib qemugl"
+DEPENDS = "zlib alsa-lib virtual/libx11"
 
 # QEMU_TARGETS is overridable variable
 QEMU_TARGETS ?= "arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64"

@@ -40,7 +40,7 @@ do_configure_prepend_virtclass-native() {
 
 do_configure() {
     ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --disable-strip ${EXTRA_OECONF}
-    chmod a+x ${S}/target-i386/beginend_funcs.sh
+    test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh
 }
 
 do_install () {

@@ -50,7 +50,6 @@ do_install () {
 	install -m 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu
 }
 
-SRC_URI_append_virtclass-nativesdk = " file://glflags.patch"
 DEPENDS_virtclass-native = "zlib-native alsa-lib-native"
 DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk qemugl-nativesdk"
 RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk"

index de12f62..055321e 100644
@@ -11,22 +11,36 @@ FILESDIR = "${WORKDIR}"
 SRC_URI = "\
     http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz \
     file://powerpc_rom.bin \
-    file://qemu-git-qemugl-host.patch \
     file://no-strip.patch \
-    file://fix-nogl.patch \
-    file://qemugl-allow-glxcontext-release.patch \
     file://linker-flags.patch \
-    file://init-info.patch \
     file://qemu-vmware-vga-depth.patch \
-    file://enable-i386-linux-user.patch \
     file://fix-configure-checks.patch \
     file://fallback-to-safe-mmap_min_addr.patch \
     file://spice-qxl-locking-fix-for-qemu-kvm.patch \
     file://Detect-and-use-GCC-atomic-builtins-for-locking.patch \
     file://larger_default_ram_size.patch \
+    "
+
+# Only use the GL passthrough patches for native/nativesdk versions
+QEMUGLPATCHES = "\
+    file://qemu-git-qemugl-host.patch \
+    file://fix-nogl.patch \
+    file://qemugl-allow-glxcontext-release.patch \
+    file://init-info.patch \
+    file://enable-i386-linux-user.patch \
     file://qemugl-fix.patch \
     file://opengl-sdl-fix.patch \
     "
+
+SRC_URI_append_virtclass-native = "\
+    ${QEMUGLPATCHES} \
+    "
+
+SRC_URI_append_virtclass-nativesdk = "\
+    ${QEMUGLPATCHES} \
+    file://glflags.patch \
+    "
+
 SRC_URI[md5sum] = "f9d145d5c09de9f0984ffe9bd1229970"
 SRC_URI[sha256sum] = "ba21e84d7853217830e167dae9999cdbff481189c6a0bb600ac7fb7201453108"
 

index 7a0c6da..9ef1acd 100644
@@ -394,7 +394,7 @@ python write_specfile () {
 							pv = subd['PKGV']
 							reppv = pv.replace('-', '+')
 							ver = ver.replace(pv, reppv)
-				newdeps_dict[strip_multilib(dep, d)] = ver
+				newdeps_dict[dep] = ver
 			depends = bb.utils.join_deps(newdeps_dict)
 			bb.data.setVar(varname, depends.strip(), d)
 

@@ -516,12 +516,12 @@ python write_specfile () {
 		# Map the dependencies into their final form
 		bb.build.exec_func("mapping_rename_hook", localdata)
 
-		splitrdepends    = bb.data.getVar('RDEPENDS', localdata, True) or ""
-		splitrrecommends = bb.data.getVar('RRECOMMENDS', localdata, True) or ""
-		splitrsuggests   = bb.data.getVar('RSUGGESTS', localdata, True) or ""
-		splitrprovides   = bb.data.getVar('RPROVIDES', localdata, True) or ""
-		splitrreplaces   = bb.data.getVar('RREPLACES', localdata, True) or ""
-		splitrconflicts  = bb.data.getVar('RCONFLICTS', localdata, True) or ""
+		splitrdepends    = strip_multilib(bb.data.getVar('RDEPENDS', localdata, True), d) or ""
+		splitrrecommends = strip_multilib(bb.data.getVar('RRECOMMENDS', localdata, True), d) or ""
+		splitrsuggests   = strip_multilib(bb.data.getVar('RSUGGESTS', localdata, True), d) or ""
+		splitrprovides   = strip_multilib(bb.data.getVar('RPROVIDES', localdata, True), d) or ""
+		splitrreplaces   = strip_multilib(bb.data.getVar('RREPLACES', localdata, True), d) or ""
+		splitrconflicts  = strip_multilib(bb.data.getVar('RCONFLICTS', localdata, True), d) or ""
 		splitrobsoletes  = []
 
 		# For now we need to manually supplement RPROVIDES with any update-alternatives links

index 3bfb8ff..d0840d5 100644
@@ -38,7 +38,7 @@ python populate_packages_append () {
 
 		bb.note("adding hicolor-icon-theme dependency to %s" % pkg)	
 		rdepends = bb.data.getVar('RDEPENDS_%s' % pkg, d, 1)
-		rdepends += " hicolor-icon-theme"
+		rdepends = rdepends + ' ' + bb.data.getVar('MLPREFIX', d) + "hicolor-icon-theme"
 		bb.data.setVar('RDEPENDS_%s' % pkg, rdepends, d)
 	
 		bb.note("adding gtk-icon-cache postinst and postrm scripts to %s" % pkg)

similarity index 80%
rename from meta/recipes-graphics/xorg-util/util-macros_1.14.0.bb
rename to meta/recipes-graphics/xorg-util/util-macros_1.15.0.bb
index 4fa235b..fb1772b 100644
@@ -20,5 +20,5 @@ RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "cbe57cd7cc492a762466f5280a7ffba8"
-SRC_URI[sha256sum] = "9bd6949b930aadfce32bc9e101008d4c6ff48329ed0e3a467990bee69f574d66"
+SRC_URI[md5sum] = "c7f0c94126443f6744328a92d2b94cff"
+SRC_URI[sha256sum] = "db05c59c0e7843c398ed2847ba4b5bf54292499e5fcadbb7c38a445bf4347ab8"

index b15786d..7a0c6da 100644
@@ -357,8 +357,8 @@ python write_specfile () {
 		multilibs = d.getVar('MULTILIBS', True) or ""
 		for ext in multilibs.split():
 			eext = ext.split(':')
-			if len(eext) > 1 and eext[0] == 'multilib' and name and name.find(eext[1] + '-') == 0:
-				name = (eext[1] + '-').join(name.split(eext[1] + '-', 1)[1:])
+			if len(eext) > 1 and eext[0] == 'multilib' and name and name.find(eext[1] + '-') >= 0:
+				name = "".join(name.split(eext[1] + '-'))
 		return name
 
 #		ml = bb.data.getVar("MLPREFIX", d, True)

@@ -755,8 +755,8 @@ python do_package_rpm () {
 	# and dependency information...
 	def strip_multilib(name, d):
 		ml = bb.data.getVar("MLPREFIX", d, True)
-		if ml and name and len(ml) != 0 and name.find(ml) == 0:
-			return ml.join(name.split(ml, 1)[1:])
+		if ml and name and len(ml) != 0 and name.find(ml) >= 0:
+			return "".join(name.split(ml))
 		return name
 
 	workdir = bb.data.getVar('WORKDIR', d, True)

similarity index 100%
rename from meta/recipes-graphics/freetype/freetype-2.4.4/no-hardcode.patch
rename to meta/recipes-graphics/freetype/freetype-2.4.6/no-hardcode.patch

similarity index 82%
rename from meta/recipes-graphics/freetype/freetype_2.4.4.bb
rename to meta/recipes-graphics/freetype/freetype_2.4.6.bb
index 661650c..8150dd4 100644
@@ -7,9 +7,9 @@ HOMEPAGE = "http://www.freetype.org/"
 BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype"
 
 LICENSE = "FreeTypeLicense | GPLv2+"
-LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=8bc1a580aeb518100d00a2dd29e68edf \
+LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=28d5381b1bef2649c59f20c20bae4f39 \
                     file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \
-                    file://docs/GPL.TXT;md5=8ef380476f642c20ebf40fecb0add2ec"
+                    file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec"
 
 SECTION = "libs"
 

@@ -18,8 +18,8 @@ PR = "r0"
 SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
            file://no-hardcode.patch"
 
-SRC_URI[md5sum] = "b3e2b6e2f1c3e0dffa1fd2a0f848b671"
-SRC_URI[sha256sum] = "4b8281c7dc4d375c6b65d3c6f4808e488a313fab47d7be82aad2c871c8480fef"
+SRC_URI[md5sum] = "5e6510613f612809d2d7862592b92ab7"
+SRC_URI[sha256sum] = "24a4a57f3a6859887e91f90f93f754cfc7bf9ab9246a3a696435a0c6a7a1e92a"
 
 S = "${WORKDIR}/freetype-${PV}"
 

index 132ee0f..44f1ebe 100644
@@ -20,7 +20,7 @@ SRCREV_machine_qemuppc = "c0f5dd4ef37b445d8ac73b11dd93e0ffdb7e9f6d"
 SRCREV_machine_qemux86 = "c29beadfd4364aca9358ac0fdb8356c1dbbdacb2"
 SRCREV_machine_qemux86-64 = "d0b814813bce09971c5cbb0d22bacb8842146fa0"
 SRCREV_machine = "ad13129a87957656c18584793abcee51de0e196a"
-SRCREV_meta = "7782fc673afd6a1c742409896ae787560d96fce8"
+SRCREV_meta = "9da70812ecddee0f7eeb11675f29497cb997275e"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

index 4cab6f3..9ef242f 100644
@@ -12,7 +12,6 @@ RDEPENDS_kernel-base = ""
 
 # Use a common kernel recipe for all QEMU machines
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "2.6.37+git%"
 #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 
 EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"

index ba352e2..132ee0f 100644
@@ -11,7 +11,7 @@ KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
 KBRANCH = ${KMACHINE}
 KMETA = meta
 
-LINUX_VERSION ?= "3.0"
+LINUX_VERSION ?= "3.0.1"
 LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
 
 SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2"

@@ -22,7 +22,7 @@ SRCREV_machine_qemux86-64 = "d0b814813bce09971c5cbb0d22bacb8842146fa0"
 SRCREV_machine = "ad13129a87957656c18584793abcee51de0e196a"
 SRCREV_meta = "7782fc673afd6a1c742409896ae787560d96fce8"
 
-PR = "r0"
+PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 SRCREV_FORMAT = "meta_machine"
 

similarity index 72%
rename from meta/recipes-graphics/xorg-proto/xproto_7.0.21.bb
rename to meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb
index 17b3793..54f8482 100644
@@ -14,6 +14,6 @@ PE = "1"
 EXTRA_OECONF_append = " --enable-specs=no"
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "c5a93a69b701cf81925fab02b35b0d0e"
-SRC_URI[sha256sum] = "38ee2f032c3a9e30504593f8b5e6c1161a6629daba93748a71c6f70c16f65548"
+SRC_URI[md5sum] = "da0b0eb2f432b7cc1d665b05422a0457"
+SRC_URI[sha256sum] = "ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8"
 

index 100f465..96675de 100644
@@ -46,6 +46,8 @@ PKGDEST = "${WORKDIR}/packages-split"
 
 LOCALE_SECTION ?= ''
 
+ALL_MULTILIB_PACKAGE_ARCHS = "${@all_multilib_tune_values(d, 'PACKAGE_ARCHS')}"
+
 # rpm is used for the per-file dependency identification
 PACKAGE_DEPENDS += "rpm-native"
 

@@ -184,17 +186,6 @@ python () {
         bb.data.setVarFlag('do_package', 'deptask', " ".join(deps), d)
     else:
         d.setVar("PACKAGERDEPTASK", "")
-
-    multilib_archs = []
-    multilibs= d.getVar('MULTILIBS', True) or ""
-    if multilibs:
-        for ext in multilibs.split():
-            eext = ext.split(':')
-            if len(eext) > 1:
-                if eext[0] == 'multilib':
-                    multilib_archs.append('ml' + eext[1])
-
-    d.setVar("MULTILIB_ARCHS", ' '.join(multilib_archs))
 }
 
 def splitfile(file, debugfile, debugsrcdir, d):

index 8ecf511..e83aff8 100644
@@ -64,14 +64,13 @@ python package_ipk_install () {
 package_tryout_install_multilib_ipk() {
 	#try install multilib
 	multilib_tryout_dirs=""
-	for arch in ${MULTILIB_ARCHS}; do
-		local target_rootfs="${MULTILIB_TEMP_ROOTFS}/${arch}"
+	for item in ${MULTILIB_VARIANTS}; do
+		local target_rootfs="${MULTILIB_TEMP_ROOTFS}/${item}"
 		local ipkg_args="-f ${INSTALL_CONF_IPK} -o ${target_rootfs} --force_overwrite"
 		local selected_pkg=""
-		#strip the "ml" from package_arch
-		local pkgarch_prefix="${arch:2}-"
-		for pkg in "${INSTALL_PACKAGES_MULTILIB_IPK}"; do
-			if [ ${pkg:0:${#pkgarch_prefix}} == ${pkgarch_prefix} ]; then
+		local pkgname_prefix="${item}-"
+		for pkg in ${INSTALL_PACKAGES_MULTILIB_IPK}; do
+			if [ ${pkg:0:${#pkgname_prefix}} == ${pkgname_prefix} ]; then
 			    selected_pkg="${selected_pkg} ${pkg}"
 			fi
 		done

@@ -163,7 +162,7 @@ ipk_log_check() {
 package_update_index_ipk () {
 	set -x
 
-	ipkgarchs="${PACKAGE_ARCHS} ${SDK_PACKAGE_ARCHS}"
+	ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS} ${SDK_PACKAGE_ARCHS}"
 
 	if [ ! -z "${DEPLOY_KEEP_PACKAGES}" ]; then
 		return

@@ -203,19 +202,12 @@ package_generate_ipkg_conf () {
 	done
 
 	echo "src oe file:${DEPLOY_DIR_IPK}" >> ${IPKGCONF_TARGET}
-	ipkgarchs="${PACKAGE_ARCHS}"
+	ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}"
 	for arch in $ipkgarchs; do
 		if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
 		        echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
 		fi
 	done
-
-	multilib_archs="${MULTILIB_ARCHS}"
-	for arch in $multilib_archs; do
-		if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
-		        echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
-		fi
-	done
 }
 
 package_generate_archlist () {

@@ -226,18 +218,12 @@ package_generate_archlist () {
 		priority=$(expr $priority + 5)
 	done
 
-	ipkgarchs="${PACKAGE_ARCHS}"
+	ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}"
 	priority=1
 	for arch in $ipkgarchs; do
 		echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
 		priority=$(expr $priority + 5)
 	done
-
-	multilib_archs="${MULTILIB_ARCHS}"
-	for arch in $multilib_archs; do
-		echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
-		priority=$(expr $priority + 5)
-	done
 }
 
 python do_package_ipk () {

index c66c184..56abdd8 100644
@@ -352,12 +352,16 @@ def extend_variants(d, var, extend, delim=':'):
 			variants.append(eext[1])
 	return " ".join(variants)
 
-def all_multilib_tune_values(d, var, unique=True):
+def all_multilib_tune_values(d, var, unique = True, need_split = True, delim = ' '):
 	"""Return a string of all ${var} in all multilib tune configuration"""
 	values = []
 	value = d.getVar(var, True) or ""
 	if value != "":
-		values.append(value)
+		if need_split:
+			for item in value.split(delim):
+				values.append(item)
+		else:
+			values.append(value)
 	variants = d.getVar("MULTILIB_VARIANTS", True) or ""
 	for item in variants.split():
 		localdata = bb.data.createCopy(d)

@@ -366,7 +370,17 @@ def all_multilib_tune_values(d, var, unique=True):
 		bb.data.update_data(localdata)
 		value = localdata.getVar(var, True) or ""
 		if value != "":
-			values.append(value)
+			if need_split:
+				for item in value.split(delim):
+					values.append(item)
+			else:
+				values.append(value)
 	if unique:
-		values = set(values)
-	return " ".join(values)
+		#we do this to keep order as much as possible
+		ret = []
+		for value in values:
+			if not value in ret:
+				ret.append(value)
+	else:
+		ret = values
+	return " ".join(ret)

similarity index 83%
rename from meta/recipes-connectivity/bluez/bluez-hcidump_2.0.bb
rename to meta/recipes-connectivity/bluez/bluez-hcidump_2.1.bb
index c271ed2..ce84f58 100644
@@ -11,8 +11,8 @@ PR = "r0"
 
 SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "5c2e3ef0a68b2845047867ba51ff8ac9"
-SRC_URI[sha256sum] = "b3b64fd0b18301df07d3aaf34c037c1e4808b4aaf702294822d62b5424f617fd"
+SRC_URI[md5sum] = "b160f0672276398344eebe9df1b37a2c"
+SRC_URI[sha256sum] = "a6cc20b95b6b1a28ff336aad91e124555231628689225c1155e8cd7aac1af86d"
 S = "${WORKDIR}/bluez-hcidump-${PV}"
 
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"

similarity index 94%
rename from meta/recipes-extended/cronie/cronie_1.4.7.bb
rename to meta/recipes-extended/cronie/cronie_1.4.8.bb
index bb715f2..4cfdfad 100644
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=963ea0772a2adbdcd607a9b2ec320c11 \
 SECTION = "utils"
 
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-PR = "r3"
+PR = "r0"
 
 SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
            file://crond.init \

@@ -25,8 +25,8 @@ SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
 PAM_SRC_URI = "file://crond_pam_config.patch"
 
 
-SRC_URI[md5sum] = "dfc26c47756d0c40ee27ae3c7ee98e0d"
-SRC_URI[sha256sum] = "83bae15ae5504454ba74f4142f5db3aa22be594327fea19d2534f65803137fbd"
+SRC_URI[md5sum] = "9b1d2ce6db8d1883e06635f437170657"
+SRC_URI[sha256sum] = "a3b910876f255712f1a5c364b74f34b0ceac9f6f3bbc45e854c5722785f513b3"
 
 inherit autotools update-rc.d
 

index 3f97f69..37591c2 100644
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://../epl-v10.html;md5=7aa4215a330a0a4f6a1cbf8da1a0879f
 
 SRCREV = "1855"
 PV = "0.0+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk;module=agent;proto=http \
            http://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk/epl-v10.html;name=epl \

@@ -19,7 +19,7 @@ SRC_URI = "svn://dev.eclipse.org/svnroot/dsdp/org.eclipse.tm.tcf/trunk;module=ag
 SRC_URI[epl.md5sum] = "7aa4215a330a0a4f6a1cbf8da1a0879f"
 SRC_URI[epl.sha256sum] = "4fd64aeed340d62a64a8da4b371efe0f6d0d745f4d2dbefacba86c646d36bc72"
 
-DEPENDS = "util-linux"
+DEPENDS = "util-linux openssl"
 RDEPENDS_${PN} = "bash"
 
 S = "${WORKDIR}/agent"

deleted file mode 100644
index f79511b..0000000
@@ -1,174 +0,0 @@
-Upstream-Status: Pending
-
-Nitin A Kamble <[email protected]> 2011/05/06
-
-Fix these compilation errors with gcc 4.6.0
-
-| super1.c: In function 'calc_sb_1_csum':
-| super1.c:114:6: error: variable 'i' set but not used [-Werror=unused-but-set-variable]
-| Query.c: In function 'Query':
-| Query.c:38:16: error: variable 'superrno' set but not used [-Werror=unused-but-set-variable]
-| super1.c: In function 'examine_super1':
-| super1.c:390:7: error: variable 'me' set but not used [-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-| 
-| make: *** [Query.o] Error 1
-| make: *** Waiting for unfinished jobs....
-| mdadm.c: In function 'main':
-| mdadm.c:106:6: error: variable 'auto_update_home' set but not used [-Werror=unused-but-set-variable]
-| mdmon.c: In function 'mdmon':
-| mdmon.c:354:6: error: variable 'ignore' set but not used [-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-| 
-| make: *** [mdmon.o] Error 1
-| cc1: all warnings being treated as errors
-| 
-| sysfs.c: In function 'sysfs_uevent':
-| sysfs.c:421:6: error: variable 'n' set but not used [-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-| 
-| make: *** [mdadm.o] Error 1
-| make: *** [super1.o] Error 1
-| cc1: all warnings being treated as errors
-| 
-| make: *** [sysfs.o] Error 1
-| Grow.c: In function 'Grow_reshape':
-| Grow.c:1315:6: error: variable 'changed' set but not used [-Werror=unused-but-set-variable]
-| cc1: all warnings being treated as errors
-| 
-| make: *** [Grow.o] Error 1
-| ERROR: oe_runmake failed
-
-Index: mdadm-3.2.1/Grow.c
-===================================================================
---- mdadm-3.2.1.orig/Grow.c
-+++ mdadm-3.2.1/Grow.c
-@@ -1312,7 +1312,6 @@ int Grow_reshape(char *devname, int fd, 
- 	char *subarray = NULL;
- 
- 	int frozen;
--	int changed = 0;
- 	char *container = NULL;
- 	char container_buf[20];
- 	int cfd = -1;
-@@ -1479,7 +1478,6 @@ int Grow_reshape(char *devname, int fd, 
- 		if (!quiet)
- 			fprintf(stderr, Name ": component size of %s has been set to %lluK\n",
- 				devname, size);
--		changed = 1;
- 	} else if (array.level != LEVEL_CONTAINER) {
- 		size = get_component_size(fd)/2;
- 		if (size == 0)
-Index: mdadm-3.2.1/Query.c
-===================================================================
---- mdadm-3.2.1.orig/Query.c
-+++ mdadm-3.2.1/Query.c
-@@ -35,7 +35,7 @@ int Query(char *dev)
- 	int fd = open(dev, O_RDONLY);
- 	int vers;
- 	int ioctlerr;
--	int superror, superrno;
-+	int superror;
- 	struct mdinfo info;
- 	mdu_array_info_t array;
- 	struct supertype *st = NULL;
-@@ -84,7 +84,6 @@ int Query(char *dev)
- 	st = guess_super(fd);
- 	if (st) {
- 		superror = st->ss->load_super(st, fd, dev);
--		superrno = errno;
- 	} else
- 		superror = -1;
- 	close(fd);
-Index: mdadm-3.2.1/mdadm.c
-===================================================================
---- mdadm-3.2.1.orig/mdadm.c
-+++ mdadm-3.2.1/mdadm.c
-@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
- 	char *shortopt = short_options;
- 	int dosyslog = 0;
- 	int rebuild_map = 0;
--	int auto_update_home = 0;
-+	int __attribute__((__unused__)) auto_update_home = 0;
- 	char *subarray = NULL;
- 	char *remove_path = NULL;
- 	char *udev_filename = NULL;
-Index: mdadm-3.2.1/mdmon.c
-===================================================================
---- mdadm-3.2.1.orig/mdmon.c
-+++ mdadm-3.2.1/mdmon.c
-@@ -351,7 +351,6 @@ static int mdmon(char *devname, int devn
- 	struct sigaction act;
- 	int pfd[2];
- 	int status;
--	int ignore;
- 	pid_t victim = -1;
- 	int victim_sock = -1;
- 
-@@ -459,7 +458,6 @@ static int mdmon(char *devname, int devn
- 	if (victim >= 0)
- 		victim_sock = connect_monitor(container->devname);
- 
--	ignore = chdir("/");
- 	if (!takeover && victim > 0 && victim_sock >= 0) {
- 		if (fping_monitor(victim_sock) == 0) {
- 			fprintf(stderr, "mdmon: %s already managed\n",
-@@ -507,10 +505,8 @@ static int mdmon(char *devname, int devn
- 	close(0);
- 	open("/dev/null", O_RDWR);
- 	close(1);
--	ignore = dup(0);
- #ifndef DEBUG
- 	close(2);
--	ignore = dup(0);
- #endif
- 
- 	do_manager(container);
-Index: mdadm-3.2.1/super1.c
-===================================================================
---- mdadm-3.2.1.orig/super1.c
-+++ mdadm-3.2.1/super1.c
-@@ -111,7 +111,6 @@ static unsigned int calc_sb_1_csum(struc
- 	unsigned long long newcsum;
- 	int size = sizeof(*sb) + __le32_to_cpu(sb->max_dev)*2;
- 	unsigned int *isuper = (unsigned int*)sb;
--	int i;
- 
- /* make sure I can count... */
- 	if (offsetof(struct mdp_superblock_1,data_offset) != 128 ||
-@@ -123,7 +122,7 @@ static unsigned int calc_sb_1_csum(struc
- 	disk_csum = sb->sb_csum;
- 	sb->sb_csum = 0;
- 	newcsum = 0;
--	for (i=0; size>=4; size -= 4 ) {
-+	for (; size>=4; size -= 4 ) {
- 		newcsum += __le32_to_cpu(*isuper);
- 		isuper++;
- 	}
-@@ -387,13 +386,10 @@ static void examine_super1(struct supert
- 	printf("   Array State : ");
- 	for (d=0; d<__le32_to_cpu(sb->raid_disks) + delta_extra; d++) {
- 		int cnt = 0;
--		int me = 0;
- 		unsigned int i;
- 		for (i=0; i< __le32_to_cpu(sb->max_dev); i++) {
- 			unsigned int role = __le16_to_cpu(sb->dev_roles[i]);
- 			if (role == d) {
--				if (i == __le32_to_cpu(sb->dev_number))
--					me = 1;
- 				cnt++;
- 			}
- 		}
-Index: mdadm-3.2.1/sysfs.c
-===================================================================
---- mdadm-3.2.1.orig/sysfs.c
-+++ mdadm-3.2.1/sysfs.c
-@@ -418,7 +418,7 @@ int sysfs_set_num(struct mdinfo *sra, st
- int sysfs_uevent(struct mdinfo *sra, char *event)
- {
- 	char fname[50];
--	int n;
-+	int __attribute__((__unused__)) n;
- 	int fd;
- 
- 	sprintf(fname, "/sys/block/%s/uevent",

similarity index 77%
rename from meta/recipes-extended/mdadm/mdadm_3.2.1.bb
rename to meta/recipes-extended/mdadm/mdadm_3.2.2.bb
index 80fe520..5d29ae7 100644
@@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
                     file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
 
-PR = "r1"
+PR = "r0"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
-	file://fix_for_compilation_with_gcc-4.6.0.patch"
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "d1e2549202bd79d9e99f1498d1109530"
-SRC_URI[sha256sum] = "7f68f149c6c0e8893d0b9220ac255b46af08e6a6b81223cab57ed54d628ae125"
+SRC_URI[md5sum] = "12ee2fbf3beddb60601fb7a4c4905651"
+SRC_URI[sha256sum] = "0d1a04e688b082bc88846e3f524abd50bc782b6ffc06123140f7d358c8f9b906"
 
 CFLAGS += "-fno-strict-aliasing"
 

index c7e5db5..984e330 100644
@@ -994,13 +994,13 @@ RECIPE_MAINTAINER_pn-quota = "Dongxiao Xu <[email protected]>"
 
 RECIPE_STATUS_pn-mdadm = "green"
 RECIPE_DEPENDENCY_CHECK_pn-mdadm = "not done"
-RECIPE_LATEST_VERSION_pn-mdadm = "3.2.1"
+RECIPE_LATEST_VERSION_pn-mdadm = "3.2.2"
 RECIPE_NO_OF_PATCHES_pn-mdadm = "0"
 RECIPE_INTEL_SECTION_pn-mdadm = "base utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mdadm = "1+ months"
-RECIPE_LATEST_RELEASE_DATE_pn-mdadm = "Mar 28, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mdadm = "2+ months"
+RECIPE_LATEST_RELEASE_DATE_pn-mdadm = "Jun 17, 2011"
 RECIPE_COMMENTS_pn-mdadm = ""
-RECIPE_LAST_UPDATE_pn-mdadm = "Apr 20, 2011"
+RECIPE_LAST_UPDATE_pn-mdadm = "Aug 16, 2011"
 RECIPE_MAINTAINER_pn-mdadm = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-screen = "green"

@@ -1986,13 +1986,13 @@ RECIPE_MAINTAINER_pn-cpio = "Scott Garman <[email protected]>"
 
 RECIPE_STATUS_pn-cronie = "green"
 RECIPE_DEPENDENCY_CHECK_pn-cronie = "not done"
-RECIPE_LATEST_VERSION_pn-cronie = "1.4.7"
-RECIPE_MANUAL_CHECK_DATE_pn-cronie = "Apr 11, 2011"
+RECIPE_LATEST_VERSION_pn-cronie = "1.4.8"
+RECIPE_MANUAL_CHECK_DATE_pn-cronie = "Aug 16, 2011"
 RECIPE_INTEL_SECTION_pn-cronie = "base"
 RECIPE_NO_OF_PATCHES_pn-cronie = "0"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-cronie = "5 months"
-RECIPE_LATEST_RELEASE_DATE_pn-cronie = "Mar 17, 2011"
-RECIPE_LAST_UPDATE_pn-cronie = "Apr 11, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-cronie = "3 months"
+RECIPE_LATEST_RELEASE_DATE_pn-cronie = "Jun 27, 2011"
+RECIPE_LAST_UPDATE_pn-cronie = "Aug 16, 2011"
 RECIPE_MAINTAINER_pn-cronie = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-grep = "green" 

@@ -3839,13 +3839,13 @@ RECIPE_MAINTAINER_pn-fontsproto = "Dexuan Cui <[email protected]>"
 RECIPE_STATUS_pn-glproto = "green"
 DISTRO_PN_ALIAS_pn-glproto = "Meego=xorg-x11-proto-glproto"
 RECIPE_DEPENDENCY_CHECK_pn-glproto = "not done"
-RECIPE_LATEST_VERSION_pn-glproto = "1.4.13"
+RECIPE_LATEST_VERSION_pn-glproto = "1.4.14"
 RECIPE_NO_OF_PATCHES_pn-glproto = "0"
 RECIPE_INTEL_SECTION_pn-glproto = "x11/libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-glproto = "9 months"
-RECIPE_LATEST_RELEASE_DATE_pn-glproto = "May 4, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-glproto = "1+ months"
+RECIPE_LATEST_RELEASE_DATE_pn-glproto = "Jun 29, 2011"
 RECIPE_COMMENTS_pn-glproto = ""
-RECIPE_LAST_UPDATE_pn-glproto = "Jun 13, 2011"
+RECIPE_LAST_UPDATE_pn-glproto = "Aug 16, 2011"
 RECIPE_MAINTAINER_pn-glproto = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-inputproto = "green"

@@ -4110,13 +4110,13 @@ RECIPE_MAINTAINER_pn-xineramaproto = "Dexuan Cui <[email protected]>"
 RECIPE_STATUS_pn-dri2proto = "green"
 DISTRO_PN_ALIAS_pn-dri2proto = "Meego=xorg-x11-proto-dri2proto"
 RECIPE_DEPENDENCY_CHECK_pn-dri2proto = "not done"
-RECIPE_LATEST_VERSION_pn-dri2proto = "2.4"
+RECIPE_LATEST_VERSION_pn-dri2proto = "2.6"
 RECIPE_NO_OF_PATCHES_pn-dri2proto = "0"
 RECIPE_INTEL_SECTION_pn-dri2proto = "x11/libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-dri2proto = "1+ years"
-RECIPE_LATEST_RELEASE_DATE_pn-dri2proto = "May 4, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-dri2proto = "1+ months"
+RECIPE_LATEST_RELEASE_DATE_pn-dri2proto = "Jun 29, 2011"
 RECIPE_COMMENTS_pn-dri2proto = ""
-RECIPE_LAST_UPDATE_pn-dri2proto = "Jun 13, 2011"
+RECIPE_LAST_UPDATE_pn-dri2proto = "Aug 16, 2011"
 RECIPE_MAINTAINER_pn-dri2proto = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-xcb-proto = "green"

@@ -4157,13 +4157,13 @@ RECIPE_MAINTAINER_pn-xf86vidmodeproto = "Dexuan Cui <[email protected]>"
 RECIPE_STATUS_pn-xproto = "green"
 DISTRO_PN_ALIAS_pn-xproto = "Meego=xorg-x11-proto-xproto Fedora=xorg-x11-proto-devel Ubuntu=x11proto-core-dev Debian=x11proto-core-dev Opensuse=xorg-x11-proto-devel Mandriva=x11-proto-devel"
 RECIPE_DEPENDENCY_CHECK_pn-xproto = "not done"
-RECIPE_LATEST_VERSION_pn-xproto = "7.0.21"
+RECIPE_LATEST_VERSION_pn-xproto = "7.0.22"
 RECIPE_NO_OF_PATCHES_pn-xproto = "0"
 RECIPE_INTEL_SECTION_pn-xproto = "x11/libs"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xproto = "3+ months"
-RECIPE_LATEST_RELEASE_DATE_pn-xproto = "Mar 22, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xproto = "3 months"
+RECIPE_LATEST_RELEASE_DATE_pn-xproto = "Jun 22, 2011"
 RECIPE_COMMENTS_pn-xproto = ""
-RECIPE_LAST_UPDATE_pn-xproto = "Apr 11, 2011"
+RECIPE_LAST_UPDATE_pn-xproto = "Aug 16, 2011"
 RECIPE_MAINTAINER_pn-xproto = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-liberation-fonts = "green"

@@ -4494,12 +4494,12 @@ RECIPE_MAINTAINER_pn-xkeyboard-config = "Dexuan Cui <[email protected]>"
 RECIPE_STATUS_pn-util-macros = "green"
 DISTRO_PN_ALIAS_pn-util-macros = "Meego=xorg-x11-util-macros Fedora=xorg-x11-util-macros Mandriva=x11-util-macros"
 RECIPE_DEPENDENCY_CHECK_pn-util-macros = "not done"
-RECIPE_LATEST_VERSION_pn-util-macros = "1.14.0"
+RECIPE_LATEST_VERSION_pn-util-macros = "1.15.0"
 RECIPE_INTEL_SECTION_pn-util-macros = "x11/utils"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-util-macros = "2+ months"
-RECIPE_LATEST_RELEASE_DATE_pn-util-macros = "May 27, 2011"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-util-macros = "1 month"
+RECIPE_LATEST_RELEASE_DATE_pn-util-macros = "Jun 23, 2011"
 RECIPE_COMMENTS_pn-util-macros = ""
-RECIPE_LAST_UPDATE_pn-util-macros = "Jun 13, 2011"
+RECIPE_LAST_UPDATE_pn-util-macros = "Aug 16, 2011"
 RECIPE_MAINTAINER_pn-util-macros = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-fontconfig = "green"

@@ -4516,14 +4516,14 @@ RECIPE_MAINTAINER_pn-fontconfig = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-freetype = "green"
 RECIPE_DEPENDENCY_CHECK_pn-freetype = "not done"
-RECIPE_LATEST_VERSION_pn-freetype = "2.4.4"
+RECIPE_LATEST_VERSION_pn-freetype = "2.4.6"
 RECIPE_NO_OF_PATCHES_pn-freetype = "1"
 RECIPE_PATCH_pn-freetype+no-hardcode = "fix freetype-config.in"
 RECIPE_INTEL_SECTION_pn-freetype = "libs"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-freetype = "1+ months"
-RECIPE_LATEST_RELEASE_DATE_pn-freetype = "Nov 28, 2010"
+RECIPE_LATEST_RELEASE_DATE_pn-freetype = "Jul 29, 2011"
 RECIPE_COMMENTS_pn-freetype = ""
-RECIPE_LAST_UPDATE_pn-freetype = "Jan 28, 2011"
+RECIPE_LAST_UPDATE_pn-freetype = "Aug 16, 2011"
 RECIPE_MAINTAINER_pn-freetype = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-librsvg = "green"

index 0410a92..994ec12 100644
@@ -227,7 +227,10 @@ python populate_packages_prepend() {
  
         phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
         phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
-        do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
+        try:
+                do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
+        except:
+                pass
  
         # Package all the plugins and their -dbg version and create a meta package
         import os

@@ -278,11 +281,11 @@ do_install() {
 
 	# These are host binaries, we should only use them in staging
 	rm ${D}/${bindir}/qmake
-	rm ${D}/${bindir}/uic
-	rm ${D}/${bindir}/uic3
+	rm -f ${D}/${bindir}/uic
+	rm -f ${D}/${bindir}/uic3
 	rm ${D}/${bindir}/moc
 	rm ${D}/${bindir}/rcc
-	rm ${D}/${bindir}/lrelease
+	rm -f ${D}/${bindir}/lrelease
 
 	# fix pkgconfig, libtool and prl files
 	sed -i -e s#-L${S}/lib##g \

@@ -319,6 +322,6 @@ do_install() {
 
 	#Append an E to the qtdemo file
 	if [ -n "${QT_LIBINFIX}" ] ; then
-		mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
+		[ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
 	fi
 }

deleted file mode 100644
index 19f41c9..0000000
@@ -1,53 +0,0 @@
-Upstream-Status: Inappropriate [backport from upstream]
-
-In May, people already reported the mesa-dri build issue when upgrading to
-glproto-1.4.13 and dri2proto-2.4:
-http://lists.freedesktop.org/archives/mesa-dev/2011-May/007331.html
-
-The story is: Jesse tried to change the definitions of some structs in
-glproto, dri2proto and mesa-dri, but the change in mesa-dri side was accepted
-and then reverted, see
-http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc4a3edcf9d414d5098618d5d3b79d8dd90adcc3
-
-so in glproto and dri2proto's sides, we have to revert the change, too:
-http://cgit.freedesktop.org/xorg/proto/glproto/commit/?id=7196c9441af941be74180f8e8d4e10a08659b80f
-
-We could remove this patch when upgrading to newer glproto, dri2proto and
-mesa-dri in future.
-
-Wed Jun 15 14:33:14 CST 2011
-Dexuan Cui <[email protected]>
-
--------------------------------------------------------
-
-commit 7196c9441af941be74180f8e8d4e10a08659b80f
-Author: Jesse Barnes <[email protected]>
-Date:   Thu May 5 09:21:19 2011 -0700
-
-    Revert "glxproto: make GLX swap event struct match spec"
-    
-    This reverts commit f5403828c68af0f12c79c0504df0a4781ca84b2b.
-    
-    This broke compatibility with existing code, so revert in favor of a new
-    struct definition instead.
-
-diff --git a/glxproto.h b/glxproto.h
-index dfa0647..0ff44e3 100644
---- a/glxproto.h
-+++ b/glxproto.h
-@@ -1375,13 +1375,13 @@ typedef struct {
-     BYTE pad;
-     CARD16 sequenceNumber B16;
-     CARD16 event_type B16;
--    CARD16 pad2;
-     CARD32 drawable;
-     CARD32 ust_hi B32;
-     CARD32 ust_lo B32;
-     CARD32 msc_hi B32;
-     CARD32 msc_lo B32;
--    CARD32 sbc B32;
-+    CARD32 sbc_hi B32;
-+    CARD32 sbc_lo B32;
- } xGLXBufferSwapComplete;
- 
- /************************************************************************/

similarity index 68%
rename from meta/recipes-graphics/xorg-proto/glproto_1.4.13.bb
rename to meta/recipes-graphics/xorg-proto/glproto_1.4.14.bb
index 7ba9831..76d9502 100644
@@ -1,5 +1,4 @@
 require xorg-proto-common.inc
-SRC_URI += "file://restore_the_old_xGLXBufferSwapComplete.patch"
 
 SUMMARY = "OpenGL: X OpenGL extension headers"
 

@@ -11,10 +10,10 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d44ed0146997856304dfbb512a59a8de \
                     file://glxproto.h;beginline=4;endline=32;md5=6b79c570f644363b356456e7d44471d9"
 
-PR = "r1"
+PR = "r0"
 PE = "1"
 
 BBCLASSEXTEND = "nativesdk"
 
-SRC_URI[md5sum] = "9542f2d36751a8ad7eae9d8e176f70d4"
-SRC_URI[sha256sum] = "fc0a94d4df003cb6b6953173e6498d9c4c3268ee24bcc46a1172a1e1dbd3d742"
+SRC_URI[md5sum] = "f48257daf0017f7a7667e5bf48ca3578"
+SRC_URI[sha256sum] = "7aaf555a100a63c67dbffc63153dcaaa3de1a36e605a2e98fce63f64089ff999"

deleted file mode 100644
index e628f6d..0000000
@@ -1,53 +0,0 @@
-Upstream-Status: Inappropriate [backport from upstream]
-
-In May, people already reported the mesa-dri build issue when upgrading to
-glproto-1.4.13 and dri2proto-2.4:
-http://lists.freedesktop.org/archives/mesa-dev/2011-May/007331.html
-
-The story is: Jesse tried to change the definitions of some structs
-in glproto, dri2proto and mesa-dri, but the change in mesa-dri side was accepted
-and then reverted, see
-http://cgit.freedesktop.org/mesa/mesa/commit/?id=dc4a3edcf9d414d5098618d5d3b79d8dd90adcc3
-
-so in glproto and driproto's sides, we have to revert the change, too:
-http://cgit.freedesktop.org/xorg/proto/dri2proto/commit/?id=f3c211e1ae183dab5c7529814c9f42af2c29fc6c
-
-We could remove this patch when upgrading to newer glproto, dri2proto and
-mesa-dri in future.
-
-Wed Jun 15 14:33:14 CST 2011
-Dexuan Cui <[email protected]>
-
--------------------------------------------------------
-
-commit f3c211e1ae183dab5c7529814c9f42af2c29fc6c
-Author: Jesse Barnes <[email protected]>
-Date:   Thu May 5 09:22:39 2011 -0700
-
-    Revert "dri2proto: make DRI2 swap event match GLX spec"
-    
-    This reverts commit 0ca3778de195a82087d0f07415a1cf8fc94f5b0a.
-    
-    This broke compatibility by renaming existing struct fields.  So revert
-    in favor of a new struct.
-
-diff --git a/dri2proto.h b/dri2proto.h
-index ff76355..9708a4a 100644
---- a/dri2proto.h
-+++ b/dri2proto.h
-@@ -290,13 +290,13 @@ typedef struct {
-     CARD8 pad;
-     CARD16 sequenceNumber B16;
-     CARD16 event_type B16;
--    CARD16 pad2;
-     CARD32 drawable B32;
-     CARD32 ust_hi B32;
-     CARD32 ust_lo B32;
-     CARD32 msc_hi B32;
-     CARD32 msc_lo B32;
--    CARD32 sbc B32;
-+    CARD32 sbc_hi B32;
-+    CARD32 sbc_lo B32;
- } xDRI2BufferSwapComplete;
- #define sz_xDRI2BufferSwapComplete 32
- 

similarity index 66%
rename from meta/recipes-graphics/xorg-proto/dri2proto_2.4.bb
rename to meta/recipes-graphics/xorg-proto/dri2proto_2.6.bb
index 4861f7d..99c089a 100644
@@ -1,5 +1,4 @@
 require xorg-proto-common.inc
-SRC_URI += "file://restore_to_old_xDRI2BufferSwapComplete.patch"
 
 SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers"
 

@@ -11,7 +10,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e396fa91834f8786032cad2da5638f3 \
                     file://dri2proto.h;endline=31;md5=22f28bf68d01b533f26195e94b3ed8ca"
 
-PR = "r1"
+PR = "r0"
 
-SRC_URI[md5sum] = "0cdeb1e95901813385dc9576be272bd3"
-SRC_URI[sha256sum] = "ff156f178d48ab31beeb4be5eb39d5df7540791ba489a8d94c443bb99a2376f1"
+SRC_URI[md5sum] = "2eb74959684f47c862081099059a11ab"
+SRC_URI[sha256sum] = "ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909"

index a14b35a..ab233dc 100644
@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
 
 inherit autotools pkgconfig update-rc.d
 
-DEPENDS  = "dbus glib-2.0 udev bluez4"
+BLUEZDEPENDS = "bluez4"
+DEPENDS  = "dbus glib-2.0 udev ${@base_contains('DISTRO_FEATURES', 'bluetooth','${BLUEZDEPENDS}', '', d)}"
 
 INITSCRIPT_NAME = "ofono"
 INITSCRIPT_PARAMS = "defaults 22"

index ef4fbf0..b679200 100644
@@ -7,6 +7,7 @@ SRC_URI  = "${KERNELORG_MIRROR}/linux/network/ofono/${BPN}-${PV}.tar.bz2 \
 
 EXTRA_OECONF += "\
     --enable-test \
+    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
 "
 
 SRC_URI[md5sum] = "b2656fd0bbf33f926fc86c1e8915d697"

index dbad5a1..f1770c2 100644
@@ -10,6 +10,10 @@ PR = "r1"
 SRC_URI  = "git://git.kernel.org/pub/scm/network/ofono/ofono.git;protocol=git \
 	    file://ofono"
 
+EXTRA_OECONF += "\
+    ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
+"
+
 do_configure_prepend () {
   ${S}/bootstrap
 }

index 165d689..b61b84c 100644
@@ -47,7 +47,7 @@ addtask generate_qt_config_file after do_patch before do_configure
 
 qmake_base_do_configure() {
 	case ${QMAKESPEC} in
-	*linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++)
+	*linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++|*linux-uclibceabi-oe-g++)
 		;;
 	*-oe-g++)
 		die Unsupported target ${TARGET_OS} for oe-g++ qmake spec

index aeff439..5a7b284 100644
@@ -8,8 +8,8 @@ EXTRA_OECONF += "\
   --enable-threads \
   --enable-loopback \
   --enable-ethernet \
-  --enable-wifi \
-  --enable-bluetooth \
+  ${@base_contains('DISTRO_FEATURES', 'wifi','--enable-wifi', '--disable-wifi', d)} \
+  ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
   --enable-dnsproxy \
   --disable-dhclient \
   --enable-test \

index 7d021d3..600fa7a 100755
@@ -166,7 +166,7 @@ mkdir $ODIR
 
 
 # Generate the patches and cover letter
-git format-patch -M --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
+git format-patch -M40 --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null
 
 
 # Customize the cover letter