[arch-commits] CVS update of arch/build/x11/xorg-server (2 files)

[Jan de Groot]

    Date: Sunday, August 5, 2007 @ 13:35:49
  Author: jgc
    Path: /home/cvs-arch/arch/build/x11/xorg-server

   Added: xserver-xv-crash.patch (1.1)
Modified: PKGBUILD (1.29 -> 1.30)

upgpkg: xorg-server 1.3.0.0-4
Add patch to fix xv crashes on console switch (7466)


------------------------+
 PKGBUILD               |   49 ++++++++++++++++++++++++-----------------------
 xserver-xv-crash.patch |   44 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 23 deletions(-)


Index: arch/build/x11/xorg-server/PKGBUILD
diff -u arch/build/x11/xorg-server/PKGBUILD:1.29 arch/build/x11/xorg-server/PKGBUILD:1.30
--- arch/build/x11/xorg-server/PKGBUILD:1.29	Fri Jul  6 06:25:22 2007
+++ arch/build/x11/xorg-server/PKGBUILD	Sun Aug  5 13:35:49 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.29 2007/07/06 10:25:22 alexander Exp $
+# $Id: PKGBUILD,v 1.30 2007/08/05 17:35:49 jgc Exp $
 # Maintainer: Alexander Baldeck <kth5 at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-server
 pkgver=1.3.0.0
-pkgrel=3
+pkgrel=4
 _mesaver=7.0
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
 options=('!libtool')
 provides=('x-server')
 source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
-	http://heanet.dl.sourceforge.net/mesa3d/MesaLib-${_mesaver}.tar.bz2
+	http://downloads.sourceforge.net/mesa3d/MesaLib-${_mesaver}.tar.bz2
 	xorg-redhat-die-ugly-pattern-die-die-die.patch
 	xorg-x11-server-0.99.3-init-origins-fix.patch
 	xorg-x11-server-1.0.1-Red-Hat-extramodes.patch
@@ -36,7 +36,28 @@
 	xserver-1.2.0-honor-displaysize.patch
 	xorg-x11-server-1.1.1-no-scanpci.patch
 	xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch
-	xorg-server-1.3.0-mesa-6.5.3.patch)
+	xorg-server-1.3.0-mesa-6.5.3.patch
+	xserver-xv-crash.patch)
+md5sums=('a51a7d482e3c689394755bb17bda8526'
+         '50c371455fa7532c04aa0a970f9bc51f'
+         '1a336eb22e27cbf443ec5a2ecddfa93c'
+         '342a7d2fc0727b12f2840057c1feb2be'
+         'e49b4a78cdc47a379ee49663acbabedc'
+         '0faff1bfae0c6378fae5d2875fb3972c'
+         '016e4e9f4bf2296ac756b476ff2c0495'
+         '8cae706ff61477f510f9f14b3d64fea9'
+         '4303627243b853c38422334102d018c9'
+         'a6d376b50bf487e4f2aaddc064cf1070'
+         '91d5eea40148b9e9db59c659b15fe443'
+         '0199583988cf6025759b260f9e0ef58c'
+         'af7fa4cdac7216af86f84914226aecda'
+         'e162134c68230f7b168430fe73b4881a'
+         'db37f05c6f5b6bb7d72fbf7f70386bdc'
+         '41424d3d8edb5f1fda1291675e274d0f'
+         '43257d8ade0f087870426eca1f09005c'
+         'a4dde794b9e71749dfee55b4704f12f3'
+         'b435c8a83022e197fbee26f3b430a228'
+         '9ec278cada5dbbb76dd1e95279ad46fb')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -59,6 +80,7 @@
 
   # Upstream patches backported from GIT:
   patch -Np1 -i ${startdir}/src/xorg-server-1.3.0-mesa-6.5.3.patch || return 1
+  patch -Np0 -i ${startdir}/src/xserver-xv-crash.patch || return 1
 
   # Reversed patch, fixes issues with MergedFB
   patch -Np1 -R -i ${startdir}/src/xorg-server-1.2.0-record-maxdotclock-filter.patch || return 1
@@ -105,22 +127,3 @@
   mv libGLcore.so libGLcore.xorg
   mv libglx.so libglx.xorg
 }
-md5sums=('a51a7d482e3c689394755bb17bda8526'
-         '50c371455fa7532c04aa0a970f9bc51f'
-         '1a336eb22e27cbf443ec5a2ecddfa93c'
-         '342a7d2fc0727b12f2840057c1feb2be'
-         'e49b4a78cdc47a379ee49663acbabedc'
-         '0faff1bfae0c6378fae5d2875fb3972c'
-         '016e4e9f4bf2296ac756b476ff2c0495'
-         '8cae706ff61477f510f9f14b3d64fea9'
-         '4303627243b853c38422334102d018c9'
-         'a6d376b50bf487e4f2aaddc064cf1070'
-         '91d5eea40148b9e9db59c659b15fe443'
-         '0199583988cf6025759b260f9e0ef58c'
-         'af7fa4cdac7216af86f84914226aecda'
-         'e162134c68230f7b168430fe73b4881a'
-         'db37f05c6f5b6bb7d72fbf7f70386bdc'
-         '41424d3d8edb5f1fda1291675e274d0f'
-         '43257d8ade0f087870426eca1f09005c'
-         'a4dde794b9e71749dfee55b4704f12f3'
-         'b435c8a83022e197fbee26f3b430a228')
Index: arch/build/x11/xorg-server/xserver-xv-crash.patch
diff -u /dev/null arch/build/x11/xorg-server/xserver-xv-crash.patch:1.1
--- /dev/null	Sun Aug  5 13:35:49 2007
+++ arch/build/x11/xorg-server/xserver-xv-crash.patch	Sun Aug  5 13:35:49 2007
@@ -0,0 +1,44 @@
+--- hw/xfree86/common/xf86xv.c
++++ hw/xfree86/common/xf86xv.c
+@@ -979,6 +979,9 @@ xf86XVEnlistPortInWindow(WindowPtr pWin,
+ 	winPriv->next = PrivRoot;
+ 	pWin->devPrivates[XF86XVWindowIndex].ptr = (pointer)winPriv;
+    }
++
++   portPriv->pDraw = (DrawablePtr)pWin;
++
+    return Success;
+ }
+ 
+@@ -1375,7 +1378,6 @@ xf86XVPutVideo(
+   result =  xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
+   if(result != Success) return result;
+ 
+-  portPriv->pDraw = pDraw;
+   portPriv->type = XvInputMask;
+ 
+   /* save a copy of these parameters */
+@@ -1479,7 +1481,6 @@ xf86XVPutStill(
+ 
+      xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
+      portPriv->isOn = XV_ON;
+-     portPriv->pDraw = pDraw;
+      portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;
+      portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;
+      portPriv->type = 0;  /* no mask means it's transient and should
+@@ -1529,7 +1530,6 @@ xf86XVGetVideo(
+   result =  xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);
+   if(result != Success) return result;
+ 
+-  portPriv->pDraw = pDraw;
+   portPriv->type = XvOutputMask;
+ 
+   /* save a copy of these parameters */
+@@ -1784,7 +1784,6 @@ xf86XVPutImage(
+ 	(portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) {
+ 
+      portPriv->isOn = XV_ON;
+-     portPriv->pDraw = pDraw;
+      portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;
+      portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;
+      portPriv->type = 0;  /* no mask means it's transient and should