X-Git-Url: https://git.piment-noir.org/?p=deb_xorg-server.git;a=blobdiff_plain;f=debian%2Fpatches%2Frotation-slaved-crtc-bounds.patch;fp=debian%2Fpatches%2Frotation-slaved-crtc-bounds.patch;h=08566ebbac0f8290c012efbc797242f332a45169;hp=4c8345a527c46a172045233f3d0e3dbd998e0377;hb=4db25562fe97995f20b8adc0f2e6959ed82e8635;hpb=7217e0ca50bba73dad94782e67980aeeb24ab693

diff --git a/debian/patches/rotation-slaved-crtc-bounds.patch b/debian/patches/rotation-slaved-crtc-bounds.patch
index 4c8345a..08566eb 100644
--- a/debian/patches/rotation-slaved-crtc-bounds.patch
+++ b/debian/patches/rotation-slaved-crtc-bounds.patch
@@ -18,7 +18,7 @@ Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
 
 --- a/randr/rrcrtc.c
 +++ b/randr/rrcrtc.c
-@@ -273,27 +273,43 @@
+@@ -273,27 +273,43 @@ RRCrtcPendingProperties(RRCrtcPtr crtc)
      return FALSE;
  }
  
@@ -74,7 +74,7 @@ Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
  /* overlapping counts as adjacent */
  static Bool
  crtcs_adjacent(const RRCrtcPtr a, const RRCrtcPtr b)
-@@ -466,9 +482,9 @@
+@@ -466,9 +482,9 @@ rrCheckPixmapBounding(ScreenPtr pScreen,
              if (!pScrPriv->crtcs[c]->mode)
                  continue;
              newbox.x1 = pScrPriv->crtcs[c]->x;
@@ -86,7 +86,7 @@ Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
          }
          RegionInit(&new_crtc_region, &newbox, 1);
          RegionUnion(&total_region, &total_region, &new_crtc_region);
-@@ -487,9 +503,9 @@
+@@ -487,9 +503,9 @@ rrCheckPixmapBounding(ScreenPtr pScreen,
                  if (!pScrPriv->crtcs[c]->mode)
                      continue;
                  newbox.x1 = pScrPriv->crtcs[c]->x;
@@ -98,7 +98,7 @@ Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
              }
  	    RegionInit(&new_crtc_region, &newbox, 1);
  	    RegionUnion(&total_region, &total_region, &new_crtc_region);
-@@ -544,8 +560,8 @@
+@@ -544,8 +560,8 @@ RRCrtcSet(RRCrtcPtr crtc,
              int width = 0, height = 0;
  
              if (mode) {
@@ -109,7 +109,7 @@ Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
              }
              ErrorF("have a master to look out for\n");
              ret = rrCheckPixmapBounding(master, crtc,
-@@ -1672,8 +1688,8 @@
+@@ -1672,8 +1688,8 @@ RRReplaceScanoutPixmap(DrawablePtr pDraw
          changed = FALSE;
          if (crtc->mode && crtc->x == pDrawable->x &&
              crtc->y == pDrawable->y &&