From f2af5d50672acc01d75710b2552547bdc0f1af65 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 28 Jul 2009 14:16:23 +0000 Subject: [PATCH] * Tue Jul 28 2009 Adam Jackson 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. --- xorg-x11-server.spec | 10 ++++-- xserver-1.6.99-randr-error-debugging.patch | 42 ++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 xserver-1.6.99-randr-error-debugging.patch diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index fa46398..167fe02 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -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-boot.patch # 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 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 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 diff --git a/xserver-1.6.99-randr-error-debugging.patch b/xserver-1.6.99-randr-error-debugging.patch new file mode 100644 index 0000000..52736bb --- /dev/null +++ b/xserver-1.6.99-randr-error-debugging.patch @@ -0,0 +1,42 @@ +From 9e5f2dcdd30c22661760a0a962da44e4acb6a7e3 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +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 +