rpms/xorg-x11-drv-savage/devel savage-2.1.3-alloca.patch, NONE, 1.1 xorg-x11-drv-savage.spec, 1.23, 1.24

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	xorg-x11-drv-savage.spec 
Added Files:
	savage-2.1.3-alloca.patch 
Log Message:
* Wed Jan 09 2008 Adam Jackson <ajax at redhat.com> 2.1.3-100.20071210
- Rebuild for new server ABI.
- savage-2.1.3-alloca.patch: Fix {DE,}ALLOCATE_LOCAL usage.


savage-2.1.3-alloca.patch:

--- NEW FILE savage-2.1.3-alloca.patch ---
diff -up xf86-video-savage-20071210/src/savage_dri.c.jx xf86-video-savage-20071210/src/savage_dri.c
--- xf86-video-savage-20071210/src/savage_dri.c.jx	2007-12-10 13:48:20.000000000 -0500
+++ xf86-video-savage-20071210/src/savage_dri.c	2008-01-09 14:17:03.000000000 -0500
@@ -1436,11 +1436,11 @@ SAVAGEDRIMoveBuffers(WindowPtr pParent, 
 
         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;
@@ -1471,14 +1471,14 @@ SAVAGEDRIMoveBuffers(WindowPtr pParent, 
 
         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);
-	        if (pboxNew2) DEALLOCATE_LOCAL(pboxNew2);
+	        if (pptNew2) xfree(pptNew2);
+	        if (pboxNew2) xfree(pboxNew2);
 	        if (pboxNew1) {
-		    DEALLOCATE_LOCAL(pptNew1);
-		    DEALLOCATE_LOCAL(pboxNew1);
+		    xfree(pptNew1);
+		    xfree(pboxNew1);
 		}
 	       return;
 	    }
@@ -1533,12 +1533,12 @@ SAVAGEDRIMoveBuffers(WindowPtr pParent, 
     SAVAGESelectBuffer(pScrn, SAVAGE_FRONT);
 
     if (pboxNew2) {
-        DEALLOCATE_LOCAL(pptNew2);
-        DEALLOCATE_LOCAL(pboxNew2);
+        xfree(pptNew2);
+        xfree(pboxNew2);
     }
     if (pboxNew1) {
-        DEALLOCATE_LOCAL(pptNew1);
-        DEALLOCATE_LOCAL(pboxNew1);
+        xfree(pptNew1);
+        xfree(pboxNew1);
     }
 
     BCI_SEND(0xc0020000); /* wait for 2D idle */


Index: xorg-x11-drv-savage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-savage/devel/xorg-x11-drv-savage.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xorg-x11-drv-savage.spec	10 Dec 2007 18:54:37 -0000	1.23
+++ xorg-x11-drv-savage.spec	9 Jan 2008 19:18:42 -0000	1.24
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
 Version:   2.1.3
-Release:   99.%{gitdate}%{?dist}
+Release:   100.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -20,6 +20,7 @@
 
 Patch1:    savage-2.1.2-missing-symbol.patch
 Patch2:    savage-2.1.2-panel-range-hack.patch
+Patch3:    savage-2.1.3-alloca.patch
 
 ExcludeArch: s390 s390x
 
@@ -40,6 +41,7 @@
 %setup -q -n %{tarball}-%{gitdate}
 %patch1 -p1 -b .missing-symbol
 %patch2 -p1 -b .range-hack
+%patch3 -p1 -b .alloca
 
 %build
 %if 0%{?gitdate}
@@ -70,7 +72,11 @@
 %{_mandir}/man4/savage.4*
 
 %changelog
-* Mon Dec 10 2007 Adam Jackson <ajax at redhat.com> 2.1.3-1
+* Wed Jan 09 2008 Adam Jackson <ajax at redhat.com> 2.1.3-100.20071210
+- Rebuild for new server ABI.
+- savage-2.1.3-alloca.patch: Fix {DE,}ALLOCATE_LOCAL usage.
+
+* Mon Dec 10 2007 Adam Jackson <ajax at redhat.com> 2.1.3-99.20071210
 - Today's git snapshot, for pciaccess goodness.
 
 * Mon Aug 17 2007 Dave Airlie <airlied at redhat.com>  2.1.3-1