rpms/xorg-x11-drv-nv/devel .cvsignore, 1.33, 1.34 nv-2.1.12-gf7025-gf7050.patch, 1.1, 1.2 sources, 1.35, 1.36 xorg-x11-drv-nv.spec, 1.86, 1.87 abi.patch, 1.1, NONE

[Adam Jackson]

Author: ajax

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

Modified Files:
	.cvsignore nv-2.1.12-gf7025-gf7050.patch sources 
	xorg-x11-drv-nv.spec 
Removed Files:
	abi.patch 
Log Message:
* Tue Jul 07 2009 Adam Jackson <ajax at redhat.com> 2.1.14-1
- nv 2.1.14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	7 Apr 2009 17:57:42 -0000	1.33
+++ .cvsignore	7 Jul 2009 17:57:19 -0000	1.34
@@ -1 +1 @@
-xf86-video-nv-2.1.13.tar.bz2
+xf86-video-nv-2.1.14.tar.bz2

nv-2.1.12-gf7025-gf7050.patch:

Index: nv-2.1.12-gf7025-gf7050.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/nv-2.1.12-gf7025-gf7050.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nv-2.1.12-gf7025-gf7050.patch	17 Feb 2009 01:41:42 -0000	1.1
+++ nv-2.1.12-gf7025-gf7050.patch	7 Jul 2009 17:57:19 -0000	1.2
@@ -1,9 +1,9 @@
-diff -Naur xf86-video-nv-2.1.12.orig/src/nv_driver.c xf86-video-nv-2.1.12/src/nv_driver.c
---- xf86-video-nv-2.1.12.orig/src/nv_driver.c	2008-08-26 22:46:19.000000000 +0200
-+++ xf86-video-nv-2.1.12/src/nv_driver.c	2009-01-28 21:10:42.000000000 +0100
-@@ -354,6 +354,9 @@
-   { 0x10DE0244, "GeForce Go 6150" },
-   { 0x10DE0247, "GeForce Go 6100" },
+diff -up xf86-video-nv-2.1.14/src/nv_driver.c.nv6x xf86-video-nv-2.1.14/src/nv_driver.c
+--- xf86-video-nv-2.1.14/src/nv_driver.c.nv6x	2009-07-07 13:53:15.000000000 -0400
++++ xf86-video-nv-2.1.14/src/nv_driver.c	2009-07-07 13:54:57.000000000 -0400
+@@ -381,6 +381,9 @@ static SymTabRec NVKnownChipsets[] =
+   { 0x10DE03D2, "GeForce 6100 nForce 400" },
+   { 0x10DE03D5, "GeForce 6100 nForce 420" },
  
 +  { 0x10DE053E, "GeForce 7025" },
 +  { 0x10DE053B, "GeForce 7050" },
@@ -11,7 +11,7 @@ diff -Naur xf86-video-nv-2.1.12.orig/src
  /*************** G8x ***************/
    { 0x10DE0191, "GeForce 8800 GTX" },
    { 0x10DE0193, "GeForce 8800 GTS" },
-@@ -832,6 +835,7 @@
+@@ -766,6 +769,7 @@ NVIsSupported(CARD32 id)
      case 0x0340:
      case 0x0390:
      case 0x03D0:
@@ -19,7 +19,7 @@ diff -Naur xf86-video-nv-2.1.12.orig/src
          return TRUE;
      }
  
-@@ -1759,6 +1765,7 @@
+@@ -1693,6 +1697,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
      case 0x0290:   /* GeForce 7900 */
      case 0x0390:   /* GeForce 7600 */
      case 0x0240:   /* GeForce 6100 */
@@ -27,10 +27,10 @@ diff -Naur xf86-video-nv-2.1.12.orig/src
      case 0x03D0:
           pNv->Architecture =  NV_ARCH_40;
           break;
-diff -Naur xf86-video-nv-2.1.12.orig/src/nv_hw.c xf86-video-nv-2.1.12/src/nv_hw.c
---- xf86-video-nv-2.1.12.orig/src/nv_hw.c	2008-08-25 18:59:45.000000000 +0200
-+++ xf86-video-nv-2.1.12/src/nv_hw.c	2009-01-28 21:06:24.000000000 +0100
-@@ -890,7 +890,8 @@
+diff -up xf86-video-nv-2.1.14/src/nv_hw.c.nv6x xf86-video-nv-2.1.14/src/nv_hw.c
+--- xf86-video-nv-2.1.14/src/nv_hw.c.nv6x	2009-05-06 22:14:11.000000000 -0400
++++ xf86-video-nv-2.1.14/src/nv_hw.c	2009-07-07 13:53:15.000000000 -0400
+@@ -890,7 +890,8 @@ void NVCalcStateExt (
          case NV_ARCH_30:
          default:
              if(((pNv->Chipset & 0xfff0) == 0x0240) ||
@@ -40,7 +40,7 @@ diff -Naur xf86-video-nv-2.1.12.orig/src
              {
                  state->arbitration0 = 128; 
                  state->arbitration1 = 0x0480; 
-@@ -1226,6 +1227,7 @@
+@@ -1226,6 +1227,7 @@ void NVLoadStateExt (
                case 0x01D0:
                case 0x0240:
                case 0x03D0:
@@ -48,7 +48,7 @@ diff -Naur xf86-video-nv-2.1.12.orig/src
                   pNv->PMC[0x1700/4] = pNv->PFB[0x020C/4];
                   pNv->PMC[0x1704/4] = 0;
                   pNv->PMC[0x1708/4] = 0;
-@@ -1316,7 +1318,8 @@
+@@ -1316,7 +1318,8 @@ void NVLoadStateExt (
                     pNv->PGRAPH[(0x0900/4) + i] = pNv->PFB[(0x0600/4) + i];
                     if(((pNv->Chipset & 0xfff0) != 0x0160) &&
                        ((pNv->Chipset & 0xfff0) != 0x0220) &&


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- sources	7 Apr 2009 17:57:42 -0000	1.35
+++ sources	7 Jul 2009 17:57:19 -0000	1.36
@@ -1 +1 @@
-c3231c8808a11eb4ca066e43e0f1a273  xf86-video-nv-2.1.13.tar.bz2
+118637515155624f8846c481a637c8c2  xf86-video-nv-2.1.14.tar.bz2


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.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- xorg-x11-drv-nv.spec	23 Jun 2009 00:33:33 -0000	1.86
+++ xorg-x11-drv-nv.spec	7 Jul 2009 17:57:19 -0000	1.87
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
-Version:   2.1.13
-Release:   2%{?dist}
+Version:   2.1.14
+Release:   1%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -28,7 +28,6 @@ Patch6:	    nv-2.1.6-panel-fix.patch
 Patch7:	    nv-save-rom.patch
 Patch9:	    nv-2.1.8-g80-no-doublescan.patch
 Patch10:    nv-2.1.12-gf7025-gf7050.patch
-Patch11:    abi.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -42,7 +41,6 @@ X.Org X11 nv video driver.
 %patch7 -p1 -b .save-rom
 %patch9 -p1 -b .doublescan
 %patch10 -p1 -b .nv6x
-%patch11 -p1 -b .abi
 
 %build
 %configure --disable-static
@@ -69,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue Jul 07 2009 Adam Jackson <ajax at redhat.com> 2.1.14-1
+- nv 2.1.14
+
 * Tue Jun 23 2009 Dave Airlie <airlied at redhat.com> 2.1.13-2
 - patch for new server ABI
 


--- abi.patch DELETED ---