diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 6fc3ca5..21bdaae 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -20,7 +20,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.4.99.901 -Release: 19.%{gitdate}%{?dist} +Release: 20.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -52,7 +52,7 @@ Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch Patch2013: xserver-1.4.99-document-fontpath-correctly.patch # Trivial things to maybe merge upstream at next rebase -#Patch4000: +Patch4000: xserver-1.5.0-quirk-acr.patch # Trivial things to never merge upstream ever # Don't merge this without protecting the gccisms. @@ -513,6 +513,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 09 2008 Dave Airlie 1.4.99.901-20.20080407 +- xserver-1.5.0-quirk-acr.patch - add quirk for another monitor. + * Tue Apr 08 2008 Adam Jackson 1.4.99.901-19.20080407 - Today's rebase. Patch merge, some int10 fixes. diff --git a/xserver-1.5.0-quirk-acr.patch b/xserver-1.5.0-quirk-acr.patch new file mode 100644 index 0000000..1306bcf --- /dev/null +++ b/xserver-1.5.0-quirk-acr.patch @@ -0,0 +1,30 @@ +From b19027fbaea4c3a146926e862983e0e3411fff3d Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Wed, 9 Apr 2008 14:27:58 +1000 +Subject: [PATCH] quirk: add quirk for ACR 640x350 default mode is wrong + +RH #440186 +--- + hw/xfree86/modes/xf86EdidModes.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c +index 8f7d45d..09d0039 100644 +--- a/hw/xfree86/modes/xf86EdidModes.c ++++ b/hw/xfree86/modes/xf86EdidModes.c +@@ -93,6 +93,12 @@ static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC) + DDC->vendor.prod_id == 638) + return TRUE; + ++ /* Acer F51 */ ++ if (memcmp (DDC->vendor.name, "API", 4) == 0 && ++ DDC->vendor.prod_id == 0x7602) ++ return TRUE; ++ ++ + return FALSE; + } + +-- +1.5.4.1 +