debian/changelog                                                          |    
7 ++
 debian/patches/218_randr-check-rotated-virtual-size-limits-correctly.diff |   
30 ++++++++++
 debian/patches/series                                                     |    
1 
 3 files changed, 38 insertions(+)

New commits:
commit bf3f422b644fa62e6719bd0db924a8bc7e21abab
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date:   Wed May 18 22:07:35 2011 +0300

    Add 218_randr-check-rotated-virtual-size-limits-correctly.diff
    
    Fix rotation with nvidia driver. (LP: #740933)

diff --git a/debian/changelog b/debian/changelog
index 9b23fd9..cbfa4c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.10.1-1ubuntu3) UNRELEASED; urgency=low
+
+  * Add 218_randr-check-rotated-virtual-size-limits-correctly.diff
+    - Fix rotation with nvidia driver. (LP: #740933)
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com>  Wed, 18 May 2011 22:05:18 +0300
+
 xorg-server (2:1.10.1-1ubuntu2) oneiric; urgency=low
 
   * Fix masked transformed valuator handling (LP: #774938)
diff --git 
a/debian/patches/218_randr-check-rotated-virtual-size-limits-correctly.diff 
b/debian/patches/218_randr-check-rotated-virtual-size-limits-correctly.diff
new file mode 100644
index 0000000..9baa90e
--- /dev/null
+++ b/debian/patches/218_randr-check-rotated-virtual-size-limits-correctly.diff
@@ -0,0 +1,30 @@
+diff --git a/randr/rrscreen.c b/randr/rrscreen.c
+index 1bc1a9e..da6d48d 100644
+--- a/randr/rrscreen.c
++++ b/randr/rrscreen.c
+@@ -910,12 +910,6 @@ ProcRRSetScreenConfig (ClientPtr client)
+      */
+     width = mode->mode.width;
+     height = mode->mode.height;
+-    if (rotation & (RR_Rotate_90|RR_Rotate_270))
+-    {
+-      width = mode->mode.height;
+-      height = mode->mode.width;
+-    }
+-
+     if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) {
+       client->errorValue = width;
+       free(pData);
+@@ -927,6 +921,12 @@ ProcRRSetScreenConfig (ClientPtr client)
+       return BadValue;
+     }
+ 
++    if (rotation & (RR_Rotate_90|RR_Rotate_270))
++    {
++      width = mode->mode.height;
++      height = mode->mode.width;
++    }
++
+     if (width != pScreen->width || height != pScreen->height)
+     {
+       int     c;
diff --git a/debian/patches/series b/debian/patches/series
index 44ca5ce..4e6ea40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,6 +32,7 @@
 214_glx_dri_searchdirs.patch
 215_glx_drawable_refcounting.diff
 217_revert_bgnonevisitwindow.patch
+218_randr-check-rotated-virtual-size-limits-correctly.diff
 500_xi2.1.patch
 501_xf86CoordinatesToWindow.patch
 502_gestures-extension.patch


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qmm63-0002av...@alioth.debian.org

Reply via email to