rpms/xorg-x11-drv-nv/devel nouveau-alloca.patch, NONE, 1.1 nv-2.1.6-alloca.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.59, 1.60

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nouveau-alloca.patch nv-2.1.6-alloca.patch 
Log Message:
* Wed Jan 09 2008 Adam Jackson <ajax at redhat.com> 2.1.6-3
- Rebuild yet again for new server ABI.


nouveau-alloca.patch:

--- NEW FILE nouveau-alloca.patch ---
diff -up nouveau-20070920/src/nv_cursor.c.jx nouveau-20070920/src/nv_cursor.c
--- nouveau-20070920/src/nv_cursor.c.jx	2008-01-07 16:25:42.000000000 -0500
+++ nouveau-20070920/src/nv_cursor.c	2008-01-07 16:26:13.000000000 -0500
@@ -148,18 +148,18 @@ TransformCursor (NVPtr pNv)
     /* convert to color cursor */
     if(pNv->alphaCursor) {
        dwords = MAX_CURSOR_SIZE_ALPHA * MAX_CURSOR_SIZE_ALPHA;
-       if(!(tmp = ALLOCATE_LOCAL(dwords * 4))) return;
+       if(!(tmp = xcalloc(dwords, 4))) return;
        ConvertCursor8888(pNv, pNv->curImage, tmp);
     } else {
        dwords = (MAX_CURSOR_SIZE * MAX_CURSOR_SIZE) >> 1;
-       if(!(tmp = ALLOCATE_LOCAL(dwords * 4))) return;
+       if(!(tmp = xcalloc(dwords, 4))) return;
        ConvertCursor1555(pNv, pNv->curImage, (CARD16*)tmp);
     }
 
     for(i = 0; i < dwords; i++)
         pNv->CURSOR[i] = tmp[i];
 
-    DEALLOCATE_LOCAL(tmp);
+    xfree(tmp);
 }
 
 static void

nv-2.1.6-alloca.patch:

--- NEW FILE nv-2.1.6-alloca.patch ---
diff -up xf86-video-nv-2.1.6/src/riva_cursor.c.alloca xf86-video-nv-2.1.6/src/riva_cursor.c
--- xf86-video-nv-2.1.6/src/riva_cursor.c.alloca	2007-09-12 00:24:16.000000000 -0400
+++ xf86-video-nv-2.1.6/src/riva_cursor.c	2008-01-07 16:27:58.000000000 -0500
@@ -72,13 +72,13 @@ RivaTransformCursor (RivaPtr pRiva)
     int i, dwords;
 
     dwords = (32 * 32) >> 1;
-    if(!(tmp = ALLOCATE_LOCAL(dwords * 4))) return;
+    if(!(tmp = xcalloc(dwords, 4))) return;
     RivaConvertCursor1555(pRiva, pRiva->curImage, (CARD16*)tmp);
 
     for(i = 0; i < dwords; i++)
         pRiva->riva.CURSOR[i] = tmp[i];
 
-    DEALLOCATE_LOCAL(tmp);
+    xfree(tmp);
 }
 
 static void
diff -up xf86-video-nv-2.1.6/src/nv_cursor.c.alloca xf86-video-nv-2.1.6/src/nv_cursor.c
--- xf86-video-nv-2.1.6/src/nv_cursor.c.alloca	2007-09-12 00:24:15.000000000 -0400
+++ xf86-video-nv-2.1.6/src/nv_cursor.c	2008-01-07 16:26:49.000000000 -0500
@@ -135,18 +135,18 @@ TransformCursor (NVPtr pNv)
     /* convert to color cursor */
     if(pNv->alphaCursor) {
        dwords = 64 * 64;
-       if(!(tmp = ALLOCATE_LOCAL(dwords * 4))) return;
+       if(!(tmp = xcalloc(dwords, 4))) return;
        ConvertCursor8888(pNv, pNv->curImage, tmp);
     } else {
        dwords = (32 * 32) >> 1;
-       if(!(tmp = ALLOCATE_LOCAL(dwords * 4))) return;
+       if(!(tmp = xcalloc(dwords, 4))) return;
        ConvertCursor1555(pNv, pNv->curImage, (CARD16*)tmp);
     }
 
     for(i = 0; i < dwords; i++)
         pNv->CURSOR[i] = tmp[i];
 
-    DEALLOCATE_LOCAL(tmp);
+    xfree(tmp);
 }
 
 static void


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- xorg-x11-drv-nv.spec	13 Nov 2007 22:43:18 -0000	1.59
+++ xorg-x11-drv-nv.spec	9 Jan 2008 16:51:07 -0000	1.60
@@ -9,7 +9,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.6
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -32,6 +32,8 @@
 
 Patch0:     nv-1.1.1-nv34-tweaks.patch
 Patch1:     nouveau-fix-bswap32.patch
+Patch2:	    nv-2.1.6-alloca.patch
+Patch3:     nouveau-alloca.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -49,17 +51,21 @@
 
 # disable for now, needs porting to pciaccess
 #patch0 -p1 -b .nv34-tweak
+%patch2 -p1 -b .alloca
 
+pushd ..
 tar jxf %{SOURCE1}
 cd nouveau-%{gitdate}
 #patch0 -p1 -b .nv34-tweak
 %patch1 -p1 -b .bswap32
+%patch3 -p1 -b .alloca
+popd
 
 %build
 %configure --disable-static
 make
 
-pushd nouveau-%{gitdate}
+pushd ../nouveau-%{gitdate}
 autoreconf -v --install
 %configure --disable-static
 
@@ -70,7 +76,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-pushd nouveau-%{gitdate} && make install DESTDIR=$RPM_BUILD_ROOT && popd
+pushd ../nouveau-%{gitdate} && make install DESTDIR=$RPM_BUILD_ROOT && popd
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
@@ -93,6 +99,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Wed Jan 09 2008 Adam Jackson <ajax at redhat.com> 2.1.6-3
+- Rebuild yet again for new server ABI.
+
 * Tue Nov 13 2007 Adam Jackson <ajax at redhat.com> 2.1.6-2
 - Require new server ABI.