Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Wed Nov 28 23:54:19 CET 2007.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-11-16 17:15:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-11-27 19:32:10.697886000 +0100
@@ -1,0 +2,7 @@
+Tue Nov 27 19:31:00 CET 2007 - sndirsch@suse.de
+
+- xf86-video-nv.diff
+ * Build fix for recent removal of (DE)ALLOCATE_LOCAL
+ * xcalloc needs 2 args, Xcalloc takes one
+
+-------------------------------------------------------------------
@@ -34 +41 @@
-- xf86-video-nv.difff
+- xf86-video-nv.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.Q31012/_old 2007-11-28 23:53:45.000000000 +0100
+++ /var/tmp/diff_new_pack.Q31012/_new 2007-11-28 23:53:45.000000000 +0100
@@ -14,7 +14,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 37
+Release: 41
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -254,7 +254,12 @@
/usr/%{_lib}/lib*
/usr/%{_lib}/xorg/modules/
%{_mandir}/man4/*
+
%changelog
+* Tue Nov 27 2007 - sndirsch@suse.de
+- xf86-video-nv.diff
+ * Build fix for recent removal of (DE)ALLOCATE_LOCAL
+ * xcalloc needs 2 args, Xcalloc takes one
* Fri Nov 16 2007 - sndirsch@suse.de
- xf86-video-sis 0.9.4
* This release fixes DRI with xorg-server 1.3 and above, which
@@ -280,7 +285,7 @@
- xf86-video-intel
* updated to git commit e56c166, which also includes some more
backlight fixes
-- xf86-video-nv.difff
+- xf86-video-nv.diff
* G80: Reduce load detection false positives.
* Mon Nov 12 2007 - sndirsch@suse.de
- xf86-video-intel
++++++ xf86-video-nv.diff ++++++
--- /var/tmp/diff_new_pack.Q31012/_old 2007-11-28 23:53:47.000000000 +0100
+++ /var/tmp/diff_new_pack.Q31012/_new 2007-11-28 23:53:47.000000000 +0100
@@ -61,3 +61,92 @@
load = pNv->reg[(0x0061A00C+dacOff)/4];
pNv->reg[(0x0061A00C+dacOff)/4] = 0;
pNv->reg[(0x0061A004+dacOff)/4] = 0x80000000 | tmp2;
+commit e9ada35b4d24abd44bc5d811b59c6f25af5984f4
+Author: Ian Romanick
+Date: Wed Nov 21 15:35:06 2007 -0800
+
+ Build fix for recent removal of ALLOCATE_LOCAL and DEALLOCATE_LOCAL
+
+diff --git a/src/nv_cursor.c b/src/nv_cursor.c
+index a648f60..abaaab2 100644
+--- a/src/nv_cursor.c
++++ b/src/nv_cursor.c
+@@ -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
+diff --git a/src/riva_cursor.c b/src/riva_cursor.c
+index b8dc2bf..77a3bfe 100644
+--- a/src/riva_cursor.c
++++ b/src/riva_cursor.c
+@@ -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
+commit 100f5e24da2cbc79ed761083daa9a00b107008ab
+Author: Alan Coopersmith
+Date: Mon Nov 26 13:14:40 2007 -0800
+
+ xcalloc needs 2 args, Xcalloc takes one - yay for inconsistency!
+
+diff --git a/src/nv_cursor.c b/src/nv_cursor.c
+index abaaab2..73e3fc6 100644
+--- a/src/nv_cursor.c
++++ b/src/nv_cursor.c
+@@ -135,11 +135,11 @@ TransformCursor (NVPtr pNv)
+ /* convert to color cursor */
+ if(pNv->alphaCursor) {
+ dwords = 64 * 64;
+- if(!(tmp = xcalloc(dwords * 4))) return;
++ if(!(tmp = Xcalloc(dwords * 4))) return;
+ ConvertCursor8888(pNv, pNv->curImage, tmp);
+ } else {
+ dwords = (32 * 32) >> 1;
+- if(!(tmp = xcalloc(dwords * 4))) return;
++ if(!(tmp = Xcalloc(dwords * 4))) return;
+ ConvertCursor1555(pNv, pNv->curImage, (CARD16*)tmp);
+ }
+
+diff --git a/src/riva_cursor.c b/src/riva_cursor.c
+index 77a3bfe..35d6a58 100644
+--- a/src/riva_cursor.c
++++ b/src/riva_cursor.c
+@@ -72,7 +72,7 @@ RivaTransformCursor (RivaPtr pRiva)
+ int i, dwords;
+
+ dwords = (32 * 32) >> 1;
+- if(!(tmp = xcalloc(dwords * 4))) return;
++ if(!(tmp = Xcalloc(dwords * 4))) return;
+ RivaConvertCursor1555(pRiva, pRiva->curImage, (CARD16*)tmp);
+
+ for(i = 0; i < dwords; i++)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org