rpms/xorg-x11-drv-i810/devel intel-2.2.0-alloca.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.71, 1.72

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29585

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.2.0-alloca.patch 
Log Message:
* Wed Jan 09 2008 Adam Jackson <ajax at redhat.com> 2.2.0-3
- Rebuild for new server ABI.
- intel-2.2.0-alloca.patch: Fix use of {DE,}ALLOCATE_LOCAL.


intel-2.2.0-alloca.patch:

--- NEW FILE intel-2.2.0-alloca.patch ---
diff -up xf86-video-intel-2.2.0/src/i830_dri.c.jx xf86-video-intel-2.2.0/src/i830_dri.c
--- xf86-video-intel-2.2.0/src/i830_dri.c.jx	2007-11-14 14:00:00.000000000 -0500
+++ xf86-video-intel-2.2.0/src/i830_dri.c	2008-01-09 13:06:12.000000000 -0500
@@ -1277,12 +1277,12 @@ I830DRIMoveBuffers(WindowPtr pParent, DD
 
       if (nbox > 1) {
 	 /* Keep ordering in each band, reverse order of bands */
-	 pboxNew1 = (BoxPtr) ALLOCATE_LOCAL(sizeof(BoxRec) * nbox);
+	 pboxNew1 = (BoxPtr) xalloc(sizeof(BoxRec) * nbox);
 	 if (!pboxNew1)
 	    return;
-	 pptNew1 = (DDXPointPtr) ALLOCATE_LOCAL(sizeof(DDXPointRec) * nbox);
+	 pptNew1 = (DDXPointPtr) xalloc(sizeof(DDXPointRec) * nbox);
 	 if (!pptNew1) {
-	    DEALLOCATE_LOCAL(pboxNew1);
+	    xfree(pboxNew1);
 	    return;
 	 }
 	 pboxBase = pboxNext = pbox + nbox - 1;
@@ -1313,16 +1313,16 @@ I830DRIMoveBuffers(WindowPtr pParent, DD
 
       if (nbox > 1) {
 	 /*reverse orderof rects in each band */
-	 pboxNew2 = (BoxPtr) ALLOCATE_LOCAL(sizeof(BoxRec) * nbox);
-	 pptNew2 = (DDXPointPtr) ALLOCATE_LOCAL(sizeof(DDXPointRec) * nbox);
+	 pboxNew2 = (BoxPtr) xalloc(sizeof(BoxRec) * nbox);
+	 pptNew2 = (DDXPointPtr) xalloc(sizeof(DDXPointRec) * nbox);
 	 if (!pboxNew2 || !pptNew2) {
 	    if (pptNew2)
-	       DEALLOCATE_LOCAL(pptNew2);
+	       xfree(pptNew2);
 	    if (pboxNew2)
-	       DEALLOCATE_LOCAL(pboxNew2);
+	       xfree(pboxNew2);
 	    if (pboxNew1) {
-	       DEALLOCATE_LOCAL(pptNew1);
-	       DEALLOCATE_LOCAL(pboxNew1);
+	       xfree(pptNew1);
+	       xfree(pboxNew1);
 	    }
 	    return;
 	 }
@@ -1393,12 +1393,12 @@ I830DRIMoveBuffers(WindowPtr pParent, DD
    I830EmitFlush(pScrn);
 
    if (pboxNew2) {
-      DEALLOCATE_LOCAL(pptNew2);
-      DEALLOCATE_LOCAL(pboxNew2);
+      xfree(pptNew2);
+      xfree(pboxNew2);
    }
    if (pboxNew1) {
-      DEALLOCATE_LOCAL(pptNew1);
-      DEALLOCATE_LOCAL(pboxNew1);
+      xfree(pptNew1);
+      xfree(pboxNew1);
    }
    i830MarkSync(pScrn);
 }
diff -up xf86-video-intel-2.2.0/src/i810_dri.c.jx xf86-video-intel-2.2.0/src/i810_dri.c
--- xf86-video-intel-2.2.0/src/i810_dri.c.jx	2007-11-08 12:24:07.000000000 -0500
+++ xf86-video-intel-2.2.0/src/i810_dri.c	2008-01-09 13:04:30.000000000 -0500
@@ -1231,12 +1231,12 @@ I810DRIMoveBuffers(WindowPtr pParent, DD
 
       if (nbox > 1) {
 	 /* Keep ordering in each band, reverse order of bands */
-	 pboxNew1 = (BoxPtr) ALLOCATE_LOCAL(sizeof(BoxRec) * nbox);
+	 pboxNew1 = (BoxPtr) xalloc(sizeof(BoxRec) * nbox);
 	 if (!pboxNew1)
 	    return;
-	 pptNew1 = (DDXPointPtr) ALLOCATE_LOCAL(sizeof(DDXPointRec) * nbox);
+	 pptNew1 = (DDXPointPtr) xalloc(sizeof(DDXPointRec) * nbox);
 	 if (!pptNew1) {
-	    DEALLOCATE_LOCAL(pboxNew1);
+	    xfree(pboxNew1);
 	    return;
 	 }
 	 pboxBase = pboxNext = pbox + nbox - 1;
@@ -1267,16 +1267,16 @@ I810DRIMoveBuffers(WindowPtr pParent, DD
 
       if (nbox > 1) {
 	 /*reverse orderof rects in each band */
-	 pboxNew2 = (BoxPtr) ALLOCATE_LOCAL(sizeof(BoxRec) * nbox);
-	 pptNew2 = (DDXPointPtr) ALLOCATE_LOCAL(sizeof(DDXPointRec) * nbox);
+	 pboxNew2 = (BoxPtr) xalloc(sizeof(BoxRec) * nbox);
+	 pptNew2 = (DDXPointPtr) xalloc(sizeof(DDXPointRec) * nbox);
 	 if (!pboxNew2 || !pptNew2) {
 	    if (pptNew2)
-	       DEALLOCATE_LOCAL(pptNew2);
+	       xfree(pptNew2);
 	    if (pboxNew2)
-	       DEALLOCATE_LOCAL(pboxNew2);
+	       xfree(pboxNew2);
 	    if (pboxNew1) {
-	       DEALLOCATE_LOCAL(pptNew1);
-	       DEALLOCATE_LOCAL(pboxNew1);
+	       xfree(pptNew1);
+	       xfree(pboxNew1);
 	    }
 	    return;
 	 }
@@ -1341,12 +1341,12 @@ I810DRIMoveBuffers(WindowPtr pParent, DD
    I810EmitFlush(pScrn);
 
    if (pboxNew2) {
-      DEALLOCATE_LOCAL(pptNew2);
-      DEALLOCATE_LOCAL(pboxNew2);
+      xfree(pptNew2);
+      xfree(pboxNew2);
    }
    if (pboxNew1) {
-      DEALLOCATE_LOCAL(pptNew1);
-      DEALLOCATE_LOCAL(pboxNew1);
+      xfree(pptNew1);
+      xfree(pboxNew1);
    }
 
    if (pI810->AccelInfoRec)


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- xorg-x11-drv-i810.spec	9 Jan 2008 17:17:36 -0000	1.71
+++ xorg-x11-drv-i810.spec	9 Jan 2008 18:08:40 -0000	1.72
@@ -13,6 +13,7 @@
 Source0:   http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
 Source2:   i810.xinf
 
+Patch1: intel-2.2.0-alloca.patch
 Patch2: intel-2.1.1-fix-vt-switch.patch
 Patch3: intel-2.1.1-fix-xv-reset.patch
 Patch4: intel-2.1.1-fix-xv-compiz.patch
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q -n xf86-video-intel-%{version}
+%patch1 -p1 -b .alloca
 # XXX rebase me plz
 #patch2 -p1 -b .vtswitch
 %patch3 -p1 -b .xvfix
@@ -87,6 +89,7 @@
 %changelog
 * Wed Jan 09 2008 Adam Jackson <ajax at redhat.com> 2.2.0-3
 - Rebuild for new server ABI.
+- intel-2.2.0-alloca.patch: Fix use of {DE,}ALLOCATE_LOCAL.
 
 * Mon Dec 10 2007 Dave Airlie <airlied at redhat.com> 2.2.0-2
 - hook up ch7017 (bz#408471)