xserver-xorg_git: bump SRCREV, rebase one patch and remove one already applied

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 23 insertions, 49 deletions

diff --git a/recipes/xorg-xserver/0006-glxdri2-remove-flushInvalidate.patch b/recipes/xorg-xserver/0006-glxdri2-remove-flushInvalidate.patch
deleted file mode 100644
index b6c633970a..0000000000
--- a/recipes/xorg-xserver/0006-glxdri2-remove-flushInvalidate.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4f62a6e6738b4563aa1015e6c165a30231363e1f Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 21 Feb 2010 15:01:45 +0100
-Subject: [PATCH] glxdri2: remove flushInvalidate()
-
----
- glx/glxdri2.c |    3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
-
-diff --git a/glx/glxdri2.c b/glx/glxdri2.c
-index e4f2d60..dae7b42 100644
---- a/glx/glxdri2.c
-+++ b/glx/glxdri2.c
-@@ -225,9 +225,6 @@ __glXDRIdrawableSwapBuffers(ClientPtr client, __GLXdrawable *drawable)
-     if (screen->flush)
- 	(*screen->flush->invalidate)(priv->driDrawable);
- 
--    if (screen->flush && screen->flush->flushInvalidate)
--	(*screen->flush->flushInvalidate)(priv->driDrawable);
--
-     return TRUE;
- }
- 
--- 
-1.7.0
-
diff --git a/recipes/xorg-xserver/xserver-xorg/0004-glx-dri2-Notify-the-driver-when-its-buffers-become-i.patch b/recipes/xorg-xserver/xserver-xorg/0004-glx-dri2-Notify-the-driver-when-its-buffers-become-i.patch
index 4429c1da40..f60de12236 100644
--- a/recipes/xorg-xserver/xserver-xorg/0004-glx-dri2-Notify-the-driver-when-its-buffers-become-i.patch
+++ b/recipes/xorg-xserver/xserver-xorg/0004-glx-dri2-Notify-the-driver-when-its-buffers-become-i.patch
@@ -1,15 +1,15 @@
-From cf5c8721705bcbac27986e5a29a37d2a1686570a Mon Sep 17 00:00:00 2001
+From bc57de2551b792f49a92c90f6cf8a4890ede038f Mon Sep 17 00:00:00 2001
 From: Francisco Jerez <currojerez@riseup.net>
 Date: Fri, 22 Jan 2010 06:29:37 -0800
 Subject: [PATCH 4/5] glx/dri2: Notify the driver when its buffers become invalid.
 
 Signed-off-by: Francisco Jerez <currojerez@riseup.net>
 ---
- glx/glxdri2.c |   31 ++++++++++++++++++++++++++++---
- 1 files changed, 28 insertions(+), 3 deletions(-)
+ glx/glxdri2.c |   30 ++++++++++++++++++++++++++----
+ 1 files changed, 26 insertions(+), 4 deletions(-)
 
 diff --git a/glx/glxdri2.c b/glx/glxdri2.c
-index 0f998de..e4f2d60 100644
+index edd29b0..5c617d9 100644
 --- a/glx/glxdri2.c
 +++ b/glx/glxdri2.c
 @@ -67,6 +67,7 @@ struct __GLXDRIscreen {
@@ -20,27 +20,29 @@ index 0f998de..e4f2d60 100644
  
      const __DRIcoreExtension *core;
      const __DRIdri2Extension *dri2;
-@@ -217,13 +218,16 @@ __glXDRIdrawableSwapBuffers(ClientPtr client, __GLXdrawable *drawable)
+@@ -217,6 +218,10 @@ __glXDRIdrawableSwapBuffers(ClientPtr client, __GLXdrawable *drawable)
      __GLXDRIscreen *screen = priv->screen;
      CARD64 unused;
  
--    if (screen->flush)
--	(*screen->flush->flushInvalidate)(priv->driDrawable);
--
-     if (DRI2SwapBuffers(client, drawable->pDraw, 0, 0, 0, &unused,
- 			__glXdriSwapEvent, drawable->pDraw) != Success)
- 	return FALSE;
- 
-+    if (screen->flush)
-+	(*screen->flush->invalidate)(priv->driDrawable);
-+
-+    if (screen->flush && screen->flush->flushInvalidate)
-+	(*screen->flush->flushInvalidate)(priv->driDrawable);
++    if (DRI2SwapBuffers(client, drawable->pDraw, 0, 0, 0, &unused,
++			__glXdriSwapEvent, drawable->pDraw) != Success)
++	return FALSE;
 +
+ #if __DRI2_FLUSH_VERSION >= 3
+     if (screen->flush) {
+ 	(*screen->flush->flush)(priv->driDrawable);
+@@ -227,10 +232,6 @@ __glXDRIdrawableSwapBuffers(ClientPtr client, __GLXdrawable *drawable)
+ 	(*screen->flush->flushInvalidate)(priv->driDrawable);
+ #endif
+ 
+-    if (DRI2SwapBuffers(client, drawable->pDraw, 0, 0, 0, &unused,
+-			__glXdriSwapEvent, drawable->pDraw) != Success)
+-	return FALSE;
+-
      return TRUE;
  }
  
-@@ -607,6 +611,24 @@ glxDRILeaveVT (int index, int flags)
+@@ -614,6 +615,24 @@ glxDRILeaveVT (int index, int flags)
  }
  
  static void
@@ -65,7 +67,7 @@ index 0f998de..e4f2d60 100644
  initializeExtensions(__GLXDRIscreen *screen)
  {
      const __DRIextension **extensions;
-@@ -782,6 +804,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
+@@ -789,6 +808,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
      screen->leaveVT = pScrn->LeaveVT;
      pScrn->LeaveVT = glxDRILeaveVT;
  
diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
index 9046e8f13e..54fa188a70 100644
--- a/recipes/xorg-xserver/xserver-xorg_git.bb
+++ b/recipes/xorg-xserver/xserver-xorg_git.bb
@@ -3,13 +3,13 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
 PV = "1.7.999"
-PR = "r3"
+PR = "r4"
 PR_append = "+gitr${SRCREV}"
 PE = "2"
 
 DEFAULT_PREFERENCE = "-1"
 
-SRCREV = "db4f676f25c6d8e58263d5151942be730592d444"
+SRCREV = "780c95caf9888fa4548dfe4c1c78a7e7ce99a9ed"
 SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \
 # pending changes http://lists.x.org/archives/xorg-devel/2010-January/005127.html
            file://0001-Add-a-PreConfigureWindow-hook.patch;patch=1 \
@@ -17,8 +17,6 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master
            file://0003-glx-Enforce-a-1-1-correspondence-between-GLX-and-X11.patch;patch=1 \
            file://0004-glx-dri2-Notify-the-driver-when-its-buffers-become-i.patch;patch=1 \
            file://0005-dri2-Support-the-DRI2InvalidateBuffers-event.patch;patch=1 \
-# flushInvalidate version removed in latest mesa	   
-	   file://0006-glxdri2-remove-flushInvalidate.patch;patch=1 \
            file://dolt-fix-1.7.0.patch;patch=1 \
            file://randr-support-1.7.0.patch;patch=1 \
 	   file://hack-fbdev-ignore-return-mode.patch;patch=1 \