xorg-server: Version bump to 1.7.5.901.

[gentoo-draconx.git] / x11-base / xorg-server / files / xfree86-Add-DontLie-server-flag.patch

diff --git a/x11-base/xorg-server/files/xfree86-Add-DontLie-server-flag.patch b/x11-base/xorg-server/files/xfree86-Add-DontLie-server-flag.patch
index 5a857b70088b7ccdaa9db6bc7a2e6c809d096334..7826994a28617b103b4be3ad97076ead0c2229dd 100644 (file)
--- a/x11-base/xorg-server/files/xfree86-Add-DontLie-server-flag.patch
+++ b/x11-base/xorg-server/files/xfree86-Add-DontLie-server-flag.patch
@@ -1,4 +1,4 @@
-From e68d127198bca378ff9f9a3e532d3be067a74af7 Mon Sep 17 00:00:00 2001
+From 3f5e8e89ea149a105ac191e3b7ebee922f78868f Mon Sep 17 00:00:00 2001
 From: Nick Bowler <nbowler@draconx.ca>
 Date: Wed, 6 Jan 2010 10:42:17 -0500
 Subject: [PATCH] xfree86: Add DontLie server flag.
@@ -77,7 +77,7 @@ index b2095aa..05166f9 100644
      Bool              caughtSignal;
  
 diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
-index 687ec76..11810e8 100644
+index f0a7373..21ea017 100644
 --- a/hw/xfree86/doc/man/xorg.conf.man.pre
 +++ b/hw/xfree86/doc/man/xorg.conf.man.pre
 @@ -490,6 +490,12 @@ When this option is enabled, those key sequences have no special meaning
@@ -94,18 +94,18 @@ index 687ec76..11810e8 100644
  This disables the parts of the VidMode extension used by the xvidtune client
  that can be used to change the video modes.
 diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
-index 1fc63c4..5d8bc29 100644
+index 7ba09b6..c51857b 100644
 --- a/hw/xfree86/modes/xf86RandR12.c
 +++ b/hw/xfree86/modes/xf86RandR12.c
 @@ -806,6 +806,7 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
        else
        {
-           xf86OutputPtr   output = config->output[config->compat_output];
+           xf86OutputPtr   output = xf86CompatOutput(pScrn);
 +          xf86CrtcPtr     crtc   = output->crtc;
  
-           if (output->conf_monitor &&
-               (output->conf_monitor->mon_width  > 0 &&
-@@ -817,6 +818,17 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
+           if (output &&
+               output->conf_monitor &&
+@@ -818,6 +819,17 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
                mmWidth = output->conf_monitor->mon_width;
                mmHeight = output->conf_monitor->mon_height;
            }
@@ -124,5 +124,5 @@ index 1fc63c4..5d8bc29 100644
            {
                /*
 -- 
-1.6.6.1
+1.7.0