reverted: --- xorg-server-1.3.0.0.dfsg/debian/patches/143_fedora_xserver-1.3.0-randr12-config-hack.patch +++ xorg-server-1.3.0.0.dfsg.orig/debian/patches/143_fedora_xserver-1.3.0-randr12-config-hack.patch @@ -1,36 +0,0 @@ ---- xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c.jx 2007-04-16 12:53:50.000000000 -0400 -+++ xorg-server-1.3.0.0/hw/xfree86/modes/xf86Crtc.c 2007-05-02 14:03:28.000000000 -0400 -@@ -1202,6 +1202,23 @@ - return output; - } - -+static char * -+preferredMode(ScrnInfoPtr pScrn, xf86OutputPtr output) -+{ -+ char *preferred_mode = NULL; -+ -+ /* Check for a configured preference for a particular mode */ -+ preferred_mode = xf86GetOptValString (output->options, -+ OPTION_PREFERRED_MODE); -+ if (preferred_mode) -+ return preferred_mode; -+ -+ if (pScrn->display->modes && *pScrn->display->modes) -+ preferred_mode = *pScrn->display->modes; -+ -+ return preferred_mode; -+} -+ - #define DEBUG_REPROBE 1 - - void -@@ -1377,8 +1394,7 @@ - output->probed_modes = xf86SortModes (output->probed_modes); - - /* Check for a configured preference for a particular mode */ -- preferred_mode = xf86GetOptValString (output->options, -- OPTION_PREFERRED_MODE); -+ preferred_mode = preferredMode(scrn, output); - - if (preferred_mode) - { diff -u xorg-server-1.3.0.0.dfsg/debian/patches/series xorg-server-1.3.0.0.dfsg/debian/patches/series --- xorg-server-1.3.0.0.dfsg/debian/patches/series +++ xorg-server-1.3.0.0.dfsg/debian/patches/series @@ -61,7 +61,6 @@ 140_fedora_xserver-1.3.0-domain-obiwan.patch 141_fedora_xserver-1.3.0-edid-quirk-backports.patch 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch -143_fedora_xserver-1.3.0-randr12-config-hack.patch 144_fedora_xserver-1.3.0-xnest-exposures.patch 202_Add_quirk_for_Acer_AL1706_monitor_to_force_60hz_refresh.patch 205_Bug_10770-_Inputdevs_isnt_a_valid_config_file_keyword.patch @@ -84 +82,0 @@ - diff -u xorg-server-1.3.0.0.dfsg/debian/changelog xorg-server-1.3.0.0.dfsg/debian/changelog --- xorg-server-1.3.0.0.dfsg/debian/changelog +++ xorg-server-1.3.0.0.dfsg/debian/changelog @@ -1,3 +1,11 @@ +xorg-server (2:1.3.0.0.dfsg-12ubuntu7) gutsy; urgency=low + + * Drop 143_fedora_xserver-1.3.0-randr12-config-hack.patch + as it causes failure to detect proper resolution on some intel + hardware. (closes LP: #144956) + + -- Bryce Harrington Tue, 25 Sep 2007 14:42:59 -0700 + xorg-server (2:1.3.0.0.dfsg-12ubuntu6) gutsy; urgency=low * Drop 214_Bug_9680-_Remove_bogus_blank_length_limiting_in_xf86SetModeCrtc.patch