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

Jan de Groot jgc at archlinux.org
Thu Nov 5 16:14:48 EST 2009


    Date: Thursday, November 5, 2009 @ 16:14:47
  Author: jgc
Revision: 58188

Add patch from redhat to fix crashes. Don't release a package with this yet, as other issues have been reported.
Add conflicts to current versions of nvidia-96xx and 17xx drivers, they don't work with this version

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

-------------------------------------+
 PKGBUILD                            |   11 +++++--
 xserver-1.7.1-window-pictures.patch |   50 ++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-11-05 21:05:26 UTC (rev 58187)
+++ PKGBUILD	2009-11-05 21:14:47 UTC (rev 58188)
@@ -3,7 +3,7 @@
 
 pkgname=xorg-server
 pkgver=1.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -11,18 +11,19 @@
 depends=('hal>=0.5.13' 'libgl' 'libxfont>=1.4.1' 'openssl>=0.9.8k' 'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.16.2' 'xcursor-themes>=1.0.2' 'xkeyboard-config>=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5' 'inputproto>=2.0-1')
 makedepends=('libx11>=1.3' 'mesa>=7.6' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 'xf86dgaproto>=2.1' 'recordproto>=1.14' 'libgl>=7.6' 'glproto>=1.4.10' 'xorg-util-macros>=1.3.0' 'xineramaproto>=1.2')
 conflicts=('catalyst-utils<=9.2' 'xf86-input-calcomp' 'xf86-input-citron' 'xf86-input-digitaledge' 'xf86-input-dmc' 'xf86-input-dynapro' 'xf86-input-elo2300'
-	'xf86-input-jamstudio' 'xf86-input-magellan' 'xf86-input-magictouch' 'xf86-input-microtouch' 'xf86-input-palmax' 'xf86-input-spaceorb'
-	'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98' 'xf86-video-vga' 'xf86-video-intel-legacy')
+	'xf86-input-jamstudio' 'xf86-input-magellan' 'xf86-input-magictouch' 'xf86-input-microtouch' 'xf86-input-palmax' 'xf86-input-spaceorb' 'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98' 'xf86-video-vga' 'xf86-video-intel-legacy' 'nvidia-96xx-utils<96.43.14' 'nvidia-173xx-utils<173.14.21')
 options=('!libtool')
 provides=('x-server')
 groups=('xorg')
 install=xorg-server.install
 source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
         xorg-redhat-die-ugly-pattern-die-die-die.patch
+        xserver-1.7.1-window-pictures.patch
         xvfb-run
         xvfb-run.1)
 md5sums=('dda7842467cda6018fdc87e6002e4db1'
          '1a336eb22e27cbf443ec5a2ecddfa93c'
+         '91ab84008196095d04530d170cc0f846'
          '52fd3effd80d7bc6c1660d4ecf23d31c'
          '376c70308715cd2643f7bff936d9934b')
 
@@ -33,6 +34,10 @@
 
   # 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
+  patch -Np1 -i "${srcdir}/xserver-1.7.1-window-pictures.patch" || return 1
+
   # Fix dbus config path
   sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.*  || return 1
 

Added: xserver-1.7.1-window-pictures.patch
===================================================================
--- xserver-1.7.1-window-pictures.patch	                        (rev 0)
+++ xserver-1.7.1-window-pictures.patch	2009-11-05 21:14:47 UTC (rev 58188)
@@ -0,0 +1,50 @@
+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.
+
+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
+software fallbacks without the DDX having a chance to map the drawable
+correctly.
+
+Instead, use fbCreatePixmap() and fbCopyArea() directly, without going
+through the DDX hooks.
+---
+ fb/fbpict.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/fb/fbpict.c b/fb/fbpict.c
+index 2fbef15..b9fe32a 100644
+--- a/fb/fbpict.c
++++ b/fb/fbpict.c
+@@ -280,7 +280,7 @@ copy_drawable (DrawablePtr pDraw)
+     width = pDraw->width;
+     height = pDraw->height;
+     
+-    pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, pDraw->depth, 0);
++    pPixmap = fbCreatePixmap (pScreen, width, height, pDraw->depth, 0);
+     
+     if (!pPixmap)
+ 	return NULL;
+@@ -289,7 +289,7 @@ copy_drawable (DrawablePtr pDraw)
+     
+     if (!pGC)
+     {
+-	(*pScreen->DestroyPixmap) (pPixmap);
++	fbDestroyPixmap (pPixmap);
+ 	return NULL;
+     }
+     
+@@ -302,7 +302,7 @@ copy_drawable (DrawablePtr pDraw)
+     
+     /* Then copy the window there */
+     ValidateGC(&pPixmap->drawable, pGC);
+-    (* pGC->ops->CopyArea) (pDraw, &pPixmap->drawable, pGC, 0, 0, width, height, 0, 0);
++    fbCopyArea (pDraw, &pPixmap->drawable, pGC, 0, 0, width, height, 0, 0);
+     
+     FreeScratchGC (pGC);
+     
+-- 
+1.6.5.1
+



More information about the arch-commits mailing list