rpms/xorg-x11-server/F-11 xorg-x11-server.spec, 1.437, 1.438 xserver-1.6.1-randr-gamma.patch, 1.1, 1.2

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9234

Modified Files:
	xorg-x11-server.spec xserver-1.6.1-randr-gamma.patch 
Log Message:
* Fri Apr 17 2009 Adam Jackson <ajax at redhat.com> 1.6.1-6
- xserver-1.6.1-randr-gamma.patch: Silence debugging messages.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -r1.437 -r1.438
--- xorg-x11-server.spec	17 Apr 2009 01:06:36 -0000	1.437
+++ xorg-x11-server.spec	17 Apr 2009 19:06:22 -0000	1.438
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -540,6 +540,9 @@
 
 
 %changelog
+* Fri Apr 17 2009 Adam Jackson <ajax at redhat.com> 1.6.1-6
+- xserver-1.6.1-randr-gamma.patch: Silence debugging messages.
+
 * Fri Apr 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.1-5
 - xserver-1.6.1-activate-device.patch: remove the device if activation fails.
   This fixes crashes if wacom tablets are added through hal _and_ have an

xserver-1.6.1-randr-gamma.patch:

Index: xserver-1.6.1-randr-gamma.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xserver-1.6.1-randr-gamma.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.6.1-randr-gamma.patch	16 Apr 2009 20:31:11 -0000	1.1
+++ xserver-1.6.1-randr-gamma.patch	17 Apr 2009 19:06:22 -0000	1.2
@@ -22,7 +22,6 @@
  #include "xf86DDC.h"
  #include "mipointer.h"
 diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
-index e578447..0e3cac7 100644
 --- a/hw/xfree86/common/xf86cmap.c
 +++ b/hw/xfree86/common/xf86cmap.c
 @@ -84,6 +84,7 @@ typedef struct {
@@ -79,7 +78,6 @@
 +    return BadImplementation;
  }
 diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
-index 4546492..0266c25 100644
 --- a/hw/xfree86/modes/xf86RandR12.c
 +++ b/hw/xfree86/modes/xf86RandR12.c
 @@ -1647,6 +1647,60 @@ xf86RandR13SetPanning (ScreenPtr           pScreen,
@@ -112,7 +110,7 @@
 +    CARD16 *points, *red, *green, *blue;
 +    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
 +    rrScrPrivPtr rp = rrGetScrPriv(pScrn->pScreen);
-+    ErrorF("xf86RandR12ChangeGamma called\n");
++
 +    for (i = 0; i < rp->numCrtcs; i++)
 +	size = max(size, rp->crtcs[i]->gammaSize);
 +