rpms/xorg-x11-drv-nv/F-12 nv-2.1.15-g80-nop-gamma.patch, NONE, 1.1 xorg-x11-drv-nv.spec, 1.93, 1.94

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-drv-nv.spec 
Added Files:
	nv-2.1.15-g80-nop-gamma.patch 
Log Message:
* Wed Oct 28 2009 Adam Jackson <ajax at redhat.com> 2.1.15-2
- nv-2.1.15-g80-nop-gamma.patch: Install a no-op gamma hook so we don't
  crash immediately on init.


nv-2.1.15-g80-nop-gamma.patch:
 g80_display.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE nv-2.1.15-g80-nop-gamma.patch ---
diff -up xf86-video-nv-2.1.15/src/g80_display.c.jx xf86-video-nv-2.1.15/src/g80_display.c
--- xf86-video-nv-2.1.15/src/g80_display.c.jx	2009-07-15 21:11:05.000000000 -0400
+++ xf86-video-nv-2.1.15/src/g80_display.c	2009-10-28 04:14:55.189892176 -0400
@@ -645,6 +645,12 @@ G80CrtcCommit(xf86CrtcPtr crtc)
     C(0x00000080, 0);
 }
 
+static void
+G80DispGammaSet(xf86CrtcPtr crtc, CARD16 *red, CARD16 *green, CARD16 *blue,
+		int size)
+{
+}
+
 static const xf86CrtcFuncsRec g80_crtc_funcs = {
     .dpms = G80CrtcDPMSSet,
     .save = NULL,
@@ -654,7 +660,7 @@ static const xf86CrtcFuncsRec g80_crtc_f
     .mode_fixup = G80CrtcModeFixup,
     .prepare = G80CrtcPrepare,
     .mode_set = G80CrtcModeSet,
-    // .gamma_set = G80DispGammaSet,
+    .gamma_set = G80DispGammaSet,
     .commit = G80CrtcCommit,
     .shadow_create = NULL,
     .shadow_destroy = NULL,


Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/F-12/xorg-x11-drv-nv.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- xorg-x11-drv-nv.spec	11 Sep 2009 05:58:47 -0000	1.93
+++ xorg-x11-drv-nv.spec	28 Oct 2009 18:31:27 -0000	1.94
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 nv video driver
 Name:      xorg-x11-drv-nv
 Version:   2.1.15
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -29,6 +29,7 @@ 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
 
 %description 
 X.Org X11 nv video driver.
@@ -43,6 +44,7 @@ X.Org X11 nv video driver.
 %patch9 -p1 -b .doublescan
 %patch10 -p1 -b .nv6x
 %patch11 -p1 -b .nokms
+%patch12 -p1 -b .gamma
 
 %build
 autoreconf -v --install
@@ -70,6 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nv.4*
 
 %changelog
+* Wed Oct 28 2009 Adam Jackson <ajax at redhat.com> 2.1.15-2
+- nv-2.1.15-g80-nop-gamma.patch: Install a no-op gamma hook so we don't
+  crash immediately on init.
+
 * Fri Sep 11 2009 Ben Skeggs <bskeggs at redhat.com> 2.1.15-1
 - nv 2.1.15