[xorg-x11-drv-nv] fixup patchset against 2.1.18

[Ben Skeggs]

commit 51fef5ee33d13c48f21e20fa6d9f0f2075928dd2
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Tue Aug 24 08:46:43 2010 +1000

    fixup patchset against 2.1.18

 nv-2.1.12-gf7025-gf7050.patch |   60 -----------------------------------------
 nv-2.1.15-g80-nop-gamma.patch |   25 -----------------
 nv-2.1.15-g80-update.patch    |   15 ----------
 nv-2.1.6-panel-fix.patch      |    8 +++---
 nv-refuse-kms.patch           |   29 -------------------
 xorg-x11-drv-nv.spec          |   13 +++------
 6 files changed, 8 insertions(+), 142 deletions(-)
---
diff --git a/nv-2.1.6-panel-fix.patch b/nv-2.1.6-panel-fix.patch
index b5cbe77..afe2e5a 100644
--- a/nv-2.1.6-panel-fix.patch
+++ b/nv-2.1.6-panel-fix.patch
@@ -9,15 +9,15 @@ diff -up xf86-video-nv-2.1.6/src/nv_setup.c.jx xf86-video-nv-2.1.6/src/nv_setup.
 -              (!monitorA->features.input_type && !pNv->FlatPanel))
 -           {
 -               if(monitorB) { 
--                  xfree(monitorB);
+-                  free(monitorB);
 -                  monitorB = NULL;
 -               }
 -           } else {
--              xfree(monitorA);
+-              free(monitorA);
 -              monitorA = NULL;
 -           }
 +	   if(monitorB) { 
-+	       xfree(monitorB);
++	       free(monitorB);
 +	       monitorB = NULL;
 +	   }
         }
@@ -26,7 +26,7 @@ diff -up xf86-video-nv-2.1.6/src/nv_setup.c.jx xf86-video-nv-2.1.6/src/nv_setup.
 -           if((monitorB->features.input_type && !pNv->FlatPanel) ||
 -              (!monitorB->features.input_type && pNv->FlatPanel)) 
 -           {
--              xfree(monitorB);
+-              free(monitorB);
 -           } else {
 -              monitorA = monitorB;
 -           }
diff --git a/xorg-x11-drv-nv.spec b/xorg-x11-drv-nv.spec
index b044783..5cdf414 100644
--- a/xorg-x11-drv-nv.spec
+++ b/xorg-x11-drv-nv.spec
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.18
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -27,10 +27,6 @@ Patch5:	    nv-2.1.6-starvation.patch
 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:    nv-refuse-kms.patch
-Patch12:    nv-2.1.15-g80-nop-gamma.patch
-Patch13:    nv-2.1.15-g80-update.patch
 
 %description 
 X.Org X11 nv video driver.
@@ -43,10 +39,6 @@ X.Org X11 nv video driver.
 %patch6 -p1 -b .panel
 %patch7 -p1 -b .save-rom
 %patch9 -p1 -b .doublescan
-%patch10 -p1 -b .nv6x
-%patch11 -p1 -b .nokms
-%patch12 -p1 -b .gamma
-%patch13 -p1 -b .g80-update
 
 %build
 autoreconf -v --install
@@ -74,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Tue Aug 24 2010 Ben Skeggs <bskeggs at redhat.com> 2.1.18-2
+- fixup patchset to apply against nv 2.1.18
+
 * Mon Aug 02 2010 Adam Jackson <ajax at redhat.com> 2.1.18-1
 - nv 2.1.18