rpms/xorg-x11-server/devel xserver-1.6.99-randr-error-debugging.patch, NONE, 1.1 xorg-x11-server.spec, 1.453, 1.454

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.99-randr-error-debugging.patch 
Log Message:
* Tue Jul 28 2009 Adam Jackson <ajax at redhat.com> 1.6.99-19.20090724
- xserver-1.6.99-randr-error-debugging.patch: Dump RANDR protocol errors
  to the log.
- Un-package xf8_16bpp, no one cares.


xserver-1.6.99-randr-error-debugging.patch:
 randr.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

--- NEW FILE xserver-1.6.99-randr-error-debugging.patch ---
>From 9e5f2dcdd30c22661760a0a962da44e4acb6a7e3 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Mon, 27 Jul 2009 16:52:42 -0400
Subject: [PATCH] additional randr debugging

---
 randr/randr.c |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/randr/randr.c b/randr/randr.c
index 1c1d0c4..e4d7cfc 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -477,10 +477,24 @@ RRVerticalRefresh (xRRModeInfo *mode)
 static int
 ProcRRDispatch (ClientPtr client)
 {
+    int ret;
     REQUEST(xReq);
     if (stuff->data >= RRNumberRequests || !ProcRandrVector[stuff->data])
 	return BadRequest;
-    return (*ProcRandrVector[stuff->data]) (client);
+    ret = ProcRandrVector[stuff->data](client);
+    
+    if (ret) {
+        int i;
+        ErrorF("RANDR failure: %d (extension base %d)\n", ret, RRErrorBase);
+        for (i = 0; i < stuff->length; i++) {
+            ErrorF("%08x ", ((unsigned int *)stuff) + i);
+            if ((i+1) % 4 == 0)
+               ErrorF("\n");
+        }
+        ErrorF("\n"); 
+    }
+
+    return ret;
 }
 
 static int
-- 
1.6.3.3



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -p -r1.453 -r1.454
--- xorg-x11-server.spec	27 Jul 2009 05:26:40 -0000	1.453
+++ xorg-x11-server.spec	28 Jul 2009 14:16:23 -0000	1.454
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   18.%{gitdate}%{?dist}
+Release:   19.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -75,6 +75,7 @@ Patch6023: xserver-1.6.99-use-pci-access
 
 # ajax needs to upstream this
 Patch6027: xserver-1.6.0-displayfd.patch
+Patch6028: xserver-1.6.99-randr-error-debugging.patch
 
 Patch6042: xserver-1.6.1-proc-cmdline.patch
 
@@ -356,6 +357,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT moduledir=%{moduledir}
 
 %if %{with_hw_servers}
+rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/libxf8_16bpp.so
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg
@@ -449,7 +451,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/xorg/modules/libvgahw.so
 %{_libdir}/xorg/modules/libwfb.so
 %{_libdir}/xorg/modules/libxaa.so
-%{_libdir}/xorg/modules/libxf8_16bpp.so
 %{_mandir}/man1/gtf.1*
 %{_mandir}/man1/Xorg.1*
 %{_mandir}/man1/cvt.1*
@@ -524,6 +525,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 28 2009 Adam Jackson <ajax at redhat.com> 1.6.99-19.20090724
+- xserver-1.6.99-randr-error-debugging.patch: Dump RANDR protocol errors
+  to the log.
+- Un-package xf8_16bpp, no one cares.
+
 * Mon Jul 27 2009 Dave Airlie <airlied at redhat.com> 1.6.99-18.20090724
 - xserver-1.6.99-use-pci-access-boot.patch: use pciaccess boot vga
 - not sure what is up with the Conflicts stuff