[arch-commits] Commit in xorg-server/trunk (2 files)

[Jan de Groot]

    Date: Friday, November 6, 2009 @ 16:19:53
  Author: jgc
Revision: 58261

Update patch from redhat. Update to 1.7.1.901

Modified:
  xorg-server/trunk/PKGBUILD
  xorg-server/trunk/xserver-1.7.1-window-pictures.patch

-------------------------------------+
 PKGBUILD                            |   10 +++++-----
 xserver-1.7.1-window-pictures.patch |   26 +++++++++++++++++---------
 2 files changed, 22 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-11-06 21:19:34 UTC (rev 58260)
+++ PKGBUILD	2009-11-06 21:19:53 UTC (rev 58261)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-server
-pkgver=1.7.1
-pkgrel=2
+pkgver=1.7.1.901
+pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -21,9 +21,9 @@
         xserver-1.7.1-window-pictures.patch
         xvfb-run
         xvfb-run.1)
-md5sums=('dda7842467cda6018fdc87e6002e4db1'
+md5sums=('f6b874d3bd9350ef2f3c4a11c0096d2e'
          '1a336eb22e27cbf443ec5a2ecddfa93c'
-         '91ab84008196095d04530d170cc0f846'
+         '01507da1a18737a3a9202fbd00213f4c'
          '52fd3effd80d7bc6c1660d4ecf23d31c'
          '376c70308715cd2643f7bff936d9934b')
 
@@ -35,7 +35,7 @@
   # Fixes from http://wiki.x.org/wiki/Server17Branch
 
   # http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-window-pictures.patch?view=log
-  # rev 1.3
+  # rev 1.4
   patch -Np1 -i "${srcdir}/xserver-1.7.1-window-pictures.patch" || return 1
 
   # Fix dbus config path

Modified: xserver-1.7.1-window-pictures.patch
===================================================================
--- xserver-1.7.1-window-pictures.patch	2009-11-06 21:19:34 UTC (rev 58260)
+++ xserver-1.7.1-window-pictures.patch	2009-11-06 21:19:53 UTC (rev 58261)
@@ -1,7 +1,7 @@
-From 7d1378e2631e0d400943d2d05b5b79a3c631a12f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann at redhat.com>
-Date: Wed, 4 Nov 2009 07:46:05 -0500
-Subject: [PATCH] fb: Use fb functions to copy the window to a temporary pixmap.
+From 9f493b930ef99253ba7e37dc280daff6738b6401 Mon Sep 17 00:00:00 2001
+From: Soren Sandmann Pedersen <sandmann at redhat.com>
+Date: Fri, 6 Nov 2009 10:29:49 +1000
+Subject: [PATCH] [PATCH] fb: Use fb functions to copy the window to a temporary pixmap.
 
 Previously, it would use the screen ops, but this meant that the new
 pixmap would be created by the DDX and then immediately accessed by
@@ -10,12 +10,16 @@
 
 Instead, use fbCreatePixmap() and fbCopyArea() directly, without going
 through the DDX hooks.
+
+airlied: also remove the miClearDrawable call, since we are going
+to copy over the whole drawable, and this also reenters the wrap
+chain which confuses EXA.
 ---
- fb/fbpict.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ fb/fbpict.c |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 2fbef15..b9fe32a 100644
+index 2fbef15..5c96427 100644
 --- a/fb/fbpict.c
 +++ b/fb/fbpict.c
 @@ -280,7 +280,7 @@ copy_drawable (DrawablePtr pDraw)
@@ -36,7 +40,11 @@
  	return NULL;
      }
      
-@@ -302,7 +302,7 @@ copy_drawable (DrawablePtr pDraw)
+@@ -298,11 +298,10 @@ copy_drawable (DrawablePtr pDraw)
+     gcv[1].val = IncludeInferiors;
+     dixChangeGC (NullClient, pGC, GCBackground | GCSubwindowMode, NULL, gcv);
+     ValidateGC ((DrawablePtr)pPixmap, pGC);
+-    miClearDrawable ((DrawablePtr)pPixmap, pGC);
      
      /* Then copy the window there */
      ValidateGC(&pPixmap->drawable, pGC);
@@ -46,5 +54,5 @@
      FreeScratchGC (pGC);
      
 -- 
-1.6.5.1
+1.6.5.2