debian/changelog | 16 +++++++++
debian/patches/103_fix_uxa_fill_spans.patch | 48 ++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 65 insertions(+)
New commits:
commit d76095af9906511ef8c3810c246947b9392d744a
Author: Robert Hooker <sarv...@ubuntu.com>
Date: Sun Jan 22 12:00:29 2012 -0500
Fix up merge for missing 2:2.15.901-1ubuntu4 changes.
diff --git a/debian/changelog b/debian/changelog
index ddb88ec..a48bfc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.17.0-1ubuntu2) precise; urgency=low
+
+ * Readd 103_fix_uxa_fill_spans.patch from 2:2.15.901-1ubuntu4, it
+ wasn't commited to git and was lost in the merge.
+
+ -- Robert Hooker <sarv...@ubuntu.com> Sun, 22 Jan 2012 11:57:26 -0500
+
xserver-xorg-video-intel (2:2.17.0-1ubuntu1) precise; urgency=low
* Merge from Debian. Remaining Ubuntu changes:
@@ -33,6 +40,15 @@ xserver-xorg-video-intel (2:2.16.0-1) unstable; urgency=low
-- Cyril Brulebois <k...@debian.org> Sun, 28 Aug 2011 13:15:24 +0200
+xserver-xorg-video-intel (2:2.15.901-1ubuntu4) precise; urgency=low
+
+ * Add 103_fix_uxa_fill_spans.patch: Fix clip processing for
+ uxa_fill_spans(). Fixes regression in LibreOffice causing partially
+ unpainted areas in its welcome panel.
+ (LP: #901959)
+
+ -- Bryce Harrington <br...@ubuntu.com> Fri, 09 Dec 2011 11:31:16 -0800
+
xserver-xorg-video-intel (2:2.15.901-1ubuntu3) precise; urgency=low
* Add 102_remove_surface_binding_cache.patch:
diff --git a/debian/patches/103_fix_uxa_fill_spans.patch
b/debian/patches/103_fix_uxa_fill_spans.patch
new file mode 100644
index 0000000..10c6b07
--- /dev/null
+++ b/debian/patches/103_fix_uxa_fill_spans.patch
@@ -0,0 +1,48 @@
+commit 429a36f7481b9bfd5ed137642d2916d69a713557
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Fri Dec 9 09:54:12 2011 +0000
+
+ uxa: Fix clip processing for uxa_fill_spans()
+
+ Fixes regression from e0066e77e026b0dd0daa0c3765473c7d63aa6753
+ (uxa: Simplify Composite solid acceleration for spans by only clipping
+ once) [2.15.901]
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43649
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+diff --git a/uxa/uxa-accel.c b/uxa/uxa-accel.c
+index 21957a3..e4afd13 100644
+--- a/uxa/uxa-accel.c
++++ b/uxa/uxa-accel.c
+@@ -92,21 +92,17 @@ uxa_fill_spans(DrawablePtr pDrawable, GCPtr pGC, int n,
+ nbox = REGION_NUM_RECTS(pClip);
+ pbox = REGION_RECTS(pClip);
+ while (nbox--) {
+- if (pbox->y1 > y || pbox->y2 <= y)
+- continue;
+-
+- if (x1 < pbox->x1)
+- x1 = pbox->x1;
++ int X1 = x1, X2 = x2;
++ if (X1 < pbox->x1)
++ X1 = pbox->x1;
+
+- if (x2 > pbox->x2)
+- x2 = pbox->x2;
+-
+- if (x2 <= x1)
+- continue;
++ if (X2 > pbox->x2)
++ X2 = pbox->x2;
+
+- (*uxa_screen->info->solid) (dst_pixmap,
+- x1 + off_x, y + off_y,
+- x2 + off_x, y + 1 + off_y);
++ if (X2 > X1 && pbox->y1 <= y && pbox->y2 > y)
++ (*uxa_screen->info->solid) (dst_pixmap,
++ X1 + off_x, y +
off_y,
++ X2 + off_x, y + 1 +
off_y);
+ pbox++;
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 0ab056a..4e10128 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
# Ubuntu patches
101_copy-fb.patch
+103_fix_uxa_fill_spans.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/e1rp0mf-0008oc...@vasks.debian.org
