Upgrades for clutter and X related recipes

similarity index 73%
rename from meta/recipes-graphics/xorg-proto/xproto_7.0.27.bb
rename to meta/recipes-graphics/xorg-proto/xproto_7.0.28.bb
index 796fb41..7427a7d 100644
@@ -15,5 +15,6 @@ SRC_URI += "file://xproto_fix_for_x32.patch"
 EXTRA_OECONF_append = " --enable-specs=no"
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "6c3345111a8044f730984988aacfa567"
-SRC_URI[sha256sum] = "246f23a6b235c8008183deeb1dcd76d529a099f93600b648b399811b10ea110c"
+SRC_URI[md5sum] = "3ce2f230c5d8fa929f326ad1f0fa40a8"
+SRC_URI[sha256sum] = "29e85568d1f68ceef8a2c081dad9bc0e5500a53cfffde24b564dc43d46ddf6ca"
+

deleted file mode 100644
index 12fb9df..0000000
@@ -1,81 +0,0 @@
-From 336f8633837abe4a1e5ba84b53ac8b9dac5d29a2 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <[email protected]>
-Date: Thu, 28 Nov 2013 11:59:53 -0800
-Subject: Always include config.h first
-
-This fixes some build warnings about CSRG_BASED being redefined due to
-incorrect header include ordering.
-
-Signed-off-by: Jeremy Huddleston Sequoia <[email protected]>
-
-Upstream-Status: Backport
-
-Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c
-===================================================================
---- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_client.c	2014-08-28 18:33:16.168070587 -0700
-+++ xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c	2014-08-28 18:33:16.152070587 -0700
-@@ -39,6 +39,10 @@
- #endif
- 
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "vmmouse_client.h"
- #include "vmmouse_proto.h"
- 
-Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c
-===================================================================
---- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.c	2014-08-28 18:33:16.168070587 -0700
-+++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c	2014-08-28 18:33:16.156070587 -0700
-@@ -33,6 +33,10 @@
-  */
- 
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "vmmouse_proto.h"
- 
- 
-Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h
-===================================================================
---- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.h	2014-08-28 18:33:16.168070587 -0700
-+++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h	2014-08-28 18:33:16.156070587 -0700
-@@ -36,11 +36,6 @@
- #ifndef _VMMOUSE_PROTO_H_
- #define _VMMOUSE_PROTO_H_
- 
--
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
- #include <stdint.h>
- 
- #ifdef HAVE_XORG_SERVER_1_1_0
-Index: xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c
-===================================================================
---- xf86-input-vmmouse-13.0.0.orig/tools/vmmouse_detect.c	2014-08-28 18:33:16.168070587 -0700
-+++ xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c	2014-08-28 18:33:16.160070587 -0700
-@@ -26,14 +26,14 @@
-  */
- 
- 
--#include <stdlib.h>
--#include <signal.h>
--#include "vmmouse_client.h"
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
- 
-+#include <stdlib.h>
-+#include <signal.h>
-+#include "vmmouse_client.h"
-+
- void
- segvCB(int sig)
- {

similarity index 79%
rename from meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.0.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb
index 83ea960..676f2ba 100644
@@ -8,10 +8,8 @@ standard 'mouse' driver if a VMware virtual machine is not detected."
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://always_include_config.h.patch"
-
-SRC_URI[md5sum] = "34f9f64ee6a1a51fc8266a9af24e1e07"
-SRC_URI[sha256sum] = "04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c"
+SRC_URI[md5sum] = "85e2e464b7219c495ad3a16465c226ed"
+SRC_URI[sha256sum] = "0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319"
 
 RDEPENDS_${PN} += "xf86-input-mouse"
 

new file mode 100644
index 0000000..8e83957
@@ -0,0 +1,41 @@
+Upstream-Status: Backport
+Signed-off-by: Jussi Kukkonen <[email protected]>
+
+
+
+From f8cce5f6cb2958a4074f87cd345bfe46e0dda6e1 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <[email protected]>
+Date: Mon, 20 Apr 2015 12:08:29 -0700
+Subject: cogl-framebuffer-gl: Work again on GLESv2
+
+
+diff --git a/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/driver/gl/cogl-framebuffer-gl.c
+index 793b10b..609cfb3 100644
+--- a/cogl/driver/gl/cogl-framebuffer-gl.c
++++ b/cogl/driver/gl/cogl-framebuffer-gl.c
+@@ -107,6 +107,12 @@
+ #ifndef GL_PACK_INVERT_MESA
+ #define GL_PACK_INVERT_MESA 0x8758
+ #endif
++#ifndef GL_BACK_LEFT
++#define GL_BACK_LEFT				0x0402
++#endif
++#ifndef GL_BACK_RIGHT
++#define GL_BACK_RIGHT				0x0403
++#endif
+ 
+ #ifndef GL_COLOR
+ #define GL_COLOR 0x1800
+@@ -245,6 +251,9 @@ _cogl_framebuffer_gl_flush_stereo_mode_state (CoglFramebuffer *framebuffer)
+   if (framebuffer->type == COGL_FRAMEBUFFER_TYPE_OFFSCREEN)
+     return;
+ 
++  if (!ctx->glDrawBuffer)
++    return;
++
+   /* The one-shot default draw buffer setting in _cogl_framebuffer_gl_bind
+    * must have already happened. If not it would override what we set here. */
+   g_assert (ctx->was_bound_to_onscreen);
+-- 
+cgit v0.10.2
+

deleted file mode 100644
index 6700efb..0000000
@@ -1,6 +0,0 @@
-require cogl-1.0.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
-
-SRC_URI[archive.md5sum] = "952155d526d35f297737266408e842b5"
-SRC_URI[archive.sha256sum] = "9278e519d5480eb0379efd48db024e8fdbf93f01dff48a7e756b85b508a863aa"

new file mode 100644
index 0000000..d20b814
@@ -0,0 +1,8 @@
+require cogl-1.0.inc
+
+SRC_URI += "file://cogl-framebuffer-gl-Work-again-on-GLESv2.patch"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
+SRC_URI[archive.md5sum] = "5b28897194d9ff76a574a9493d1f7ee0"
+SRC_URI[archive.sha256sum] = "729e35495829e7d31fafa3358e47b743ba21a2b08ff9b6cd28fb74c0de91192b"
+

index 80acab8..86d841b 100644
@@ -1,20 +1,32 @@
-Configure output from installed-tests to be TAP compliant, such that gnome-desktop-testing-runner properly interprets the results.
+From 668e1d14af13249384ab324c7d79ec4147f07e48 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <[email protected]>
+Date: Mon, 27 Apr 2015 20:12:33 +0300
+Subject: [PATCH] Run installed tests with tap output
+
+Configure output from installed-tests to be TAP compliant such that
+gnome-desktop-testing-runner properly interprets the results.
 
 Upstream-status: Pending
 
 Signed-off-by: Tim Orling <[email protected]>
+---
+ build/autotools/glib-tap.mk | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: clutter-1.20.0/build/autotools/glib-tap.mk
-===================================================================
---- clutter-1.20.0.orig/build/autotools/glib-tap.mk
-+++ clutter-1.20.0/build/autotools/glib-tap.mk
-@@ -128,7 +128,8 @@ installed_test_meta_DATA = $(installed_t
+diff --git a/build/autotools/glib-tap.mk b/build/autotools/glib-tap.mk
+index 7c5f82b..844e17e 100644
+--- a/build/autotools/glib-tap.mk
++++ b/build/autotools/glib-tap.mk
+@@ -127,7 +127,8 @@ installed_test_meta_DATA = $(installed_testcases:=.test)
+ %.test: %$(EXEEXT) Makefile
  	$(AM_V_GEN) (echo '[Test]' > [email protected]; \
  	echo 'Type=session' >> [email protected]; \
- 	echo 'TestEnvironment=G_ENABLE_DIAGNOSTIC=0;CLUTTER_ENABLE_DIAGNOSTIC=0;' >> [email protected]; \
--	echo 'Exec=$(installed_testdir)/$<' >> [email protected]; \
-+	echo 'Exec=$(installed_testdir)/$< --tap' >> [email protected]; \
+-	echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> [email protected]; \
++	echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$< --tap' >> [email protected]; \
 +	echo 'Output=TAP' >> [email protected]; \
  	mv [email protected] $@)
  
  CLEANFILES += $(installed_test_meta_DATA)
+-- 
+2.1.4
+

similarity index 60%
rename from meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb
rename to meta/recipes-graphics/clutter/clutter-1.0_1.22.4.bb
index 5f39a3a..418cdfd 100644
@@ -2,8 +2,8 @@ require clutter-1.0.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b"
-SRC_URI[archive.sha256sum] = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293"
+SRC_URI[archive.md5sum] = "26494256c980d49703a553916e3083cd"
+SRC_URI[archive.sha256sum] = "1d77ce16025f87667a1d00dc4fa617a1935156f63fd17635fdadf138866c9e1e"
 
 SRC_URI += "file://install-examples.patch \
             file://run-installed-tests-with-tap-output.patch \

deleted file mode 100644
index 37a035c..0000000
@@ -1,6 +0,0 @@
-require clutter-gtk-1.0.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-SRC_URI[archive.md5sum] = "ef50b52ffc2a18704eb62f13dd8d6198"
-SRC_URI[archive.sha256sum] = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e"

new file mode 100644
index 0000000..530ea18
@@ -0,0 +1,6 @@
+require clutter-gtk-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+SRC_URI[archive.md5sum] = "557d814c3e70cc3a2d1cf3816919b14f"
+SRC_URI[archive.sha256sum] = "bbd03dfa9a20102d5cdb440513b0a035933da557ad7e9da31546034de2daf069"