rpms/xorg-x11-server/devel xserver-1.3.0-edid-quirk-backports.patch, NONE, 1.1 xorg-x11-server.spec, 1.240, 1.241

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19308

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.3.0-edid-quirk-backports.patch 
Log Message:
* Thu Jul 12 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-15
- xserver-1.3.0-edid-quirk-backports.patch: Backport EDID quirks from
  master; fixes some Samsung monitors. (#232810)


xserver-1.3.0-edid-quirk-backports.patch:

--- NEW FILE xserver-1.3.0-edid-quirk-backports.patch ---
diff -up xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.jx xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c
--- xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c.jx	2007-04-18 00:33:14.000000000 -0400
+++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86EdidModes.c	2007-07-12 09:45:38.000000000 -0400
@@ -71,6 +71,10 @@ static Bool quirk_dt_sync_hm_vp (int scr
     if (memcmp (DDC->vendor.name, "VSC", 4) == 0 &&
 	DDC->vendor.prod_id == 58653)
 	return TRUE;
+    /* Samsung SyncMaster 205BW */
+    if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
+	DDC->vendor.prod_id == 541)
+	return TRUE;
 
     return FALSE;
 }
@@ -87,9 +91,10 @@ static Bool quirk_prefer_large_60 (int s
 	DDC->vendor.prod_id == 44358)
 	return TRUE;
 
-    /* Samsung SyncMaster 226BW */
+    /* Samsung SyncMaster 22[56]BW */
     if (memcmp (DDC->vendor.name, "SAM", 4) == 0 &&
-	DDC->vendor.prod_id == 638)
+	(DDC->vendor.prod_id == 638 ||
+	 DDC->vendor.prod_id == 596))
 	return TRUE;
     
     return FALSE;


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- xorg-x11-server.spec	12 Jul 2007 14:01:33 -0000	1.240
+++ xorg-x11-server.spec	12 Jul 2007 14:08:32 -0000	1.241
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   14%{?dist}
+Release:   15%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -67,6 +67,7 @@
 Patch2008:  xserver-1.3.0-randrama-no-zero-screens.patch
 Patch2009:  xserver-1.3.0-arm-iopl.patch
 Patch2010:  xserver-1.3.0-idletime.patch
+Patch2011:  xserver-1.3.0-edid-quirk-backports.patch
 
 # assorted PCI layer shenanigans.  oh the pain.
 Patch2500:  xorg-x11-server-1.2.99-unbreak-domain.patch
@@ -323,6 +324,7 @@
 %patch2008 -p1 -b .randrama-zero-screens
 %patch2009 -p1 -b .arm
 %patch2010 -p1 -b .idletime
+%patch2011 -p1 -b .edid-quirks
 
 %patch2500 -p1 -b .unbreak-domains
 %patch2501 -p1 -b .pci-bus-count
@@ -598,6 +600,10 @@
 
 
 %changelog
+* Thu Jul 12 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-15
+- xserver-1.3.0-edid-quirk-backports.patch: Backport EDID quirks from
+  master; fixes some Samsung monitors. (#232810)
+
 * Thu Jul 12 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-14
 - xserver-1.3.0-composite-version.patch: Force the server to report the
   Composite extension version it supports, not simply the version defined