rpms/xorg-x11-server/devel xserver-1.5.2-lies-damn-lies-and-aspect-ratios.patch, NONE, 1.1 xorg-x11-server.spec, 1.367, 1.368

[Adam Jackson]

Author: ajax

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

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.2-lies-damn-lies-and-aspect-ratios.patch 
Log Message:
* Tue Oct 14 2008 Adam Jackson <ajax at redhat.com> 1.5.2-4
- xserver-1.5.2-lies-damn-lies-and-aspect-ratios.patch: Catch even more
  cases of the monitor encoding aspect ratio for size. (#458747)


xserver-1.5.2-lies-damn-lies-and-aspect-ratios.patch:

--- NEW FILE xserver-1.5.2-lies-damn-lies-and-aspect-ratios.patch ---
>From bd9c6b3a4d726a3f83ac6d8cf7211eddbc28f25a Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Tue, 14 Oct 2008 14:04:01 -0400
Subject: [PATCH] EDID: Catch even more cases of encoding aspect as size.

Very cute, Samsung, not only do you claim to be 16cm by 9cm in the
global size record, you also claim to be 160mm by 90mm in the detailed
timings.  Grrr.
---
 hw/xfree86/ddc/interpret_edid.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c
index 3596e87..fbb17b1 100644
--- a/hw/xfree86/ddc/interpret_edid.c
+++ b/hw/xfree86/ddc/interpret_edid.c
@@ -115,12 +115,16 @@ handle_edid_quirks(xf86MonPtr m)
 	    }
 	}
 
-	if (real_hsize && real_vsize) {
+	if (!real_hsize || !real_vsize) {
+	    m->features.hsize = m->features.vsize = 0;
+	} else if ((m->features.hsize * 10 == real_hsize) &&
+		   (m->features.vsize * 10 == real_vsize)) {
+	    /* exact match is just unlikely, should do a better check though */
+	    m->features.hsize = m->features.vsize = 0;
+	} else {
 	    /* convert mm to cm */
 	    m->features.hsize = (real_hsize + 5) / 10;
 	    m->features.vsize = (real_vsize + 5) / 10;
-	} else {
-	    m->features.hsize = m->features.vsize = 0;
 	}
 	
 	xf86Msg(X_INFO, "Quirked EDID physical size to %dx%d cm\n",
-- 
1.6.0.1



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -r1.367 -r1.368
--- xorg-x11-server.spec	14 Oct 2008 17:03:20 -0000	1.367
+++ xorg-x11-server.spec	14 Oct 2008 18:22:20 -0000	1.368
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.2
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -85,6 +85,7 @@
 Patch6004: xserver-1.5.1-global-backtrace.patch
 Patch6005: xserver-1.5.2-mieq-backtrace.patch
 Patch6006: xserver-1.5.2-backtrace-defines.patch
+Patch6007: xserver-1.5.2-lies-damn-lies-and-aspect-ratios.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -516,6 +517,10 @@
 
 
 %changelog
+* Tue Oct 14 2008 Adam Jackson <ajax at redhat.com> 1.5.2-4
+- xserver-1.5.2-lies-damn-lies-and-aspect-ratios.patch: Catch even more
+  cases of the monitor encoding aspect ratio for size. (#458747)
+
 * Tue Oct 14 2008 Adam Jackson <ajax at redhat.com> 1.5.2-3
 - xserver-1.5.2-backtrace-defines.patch: Get HAVE_BACKTRACE defined even at
   the DIX level.