debian/changelog | 6 ++++++
debian/patches/fix-fdo65964.diff | 28 ++++++++++++++++++++++++++++
debian/patches/series | 2 +-
3 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 4cc72f2d58695a198f5694a1ebd40f12bca9ca66
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Fri Sep 20 21:04:30 2013 +0300
fix-fdo65964.diff: Add a patch from git master to fix fdo bug 65964.
diff --git a/debian/changelog b/debian/changelog
index e382191..8fb68e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+glamor-egl (0.5.0-0ubuntu2) UNRELEASED; urgency=low
+
+ * fix-fdo65964.diff: Add a patch from git master to fix fdo bug 65964.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 20 Sep 2013 18:45:55 +0300
+
glamor-egl (0.5.0-0ubuntu1) saucy; urgency=low
* Sync from unreleased debian git.
diff --git a/debian/patches/fix-fdo65964.diff b/debian/patches/fix-fdo65964.diff
new file mode 100644
index 0000000..d45646e
--- /dev/null
+++ b/debian/patches/fix-fdo65964.diff
@@ -0,0 +1,28 @@
+commit 29c0907d413ad5be2af3480d008018cd7f5a9e85
+Author: Michel Dänzer <michel.daen...@amd.com>
+Date: Tue Sep 17 13:25:02 2013 +0200
+
+ Fix RegionContainsRect test for PutImage
+
+ The return value of RegionContainsRect() is not a boolean but an enum
+ indicating that the region contains the rectangle completely, partially
+ or not at all. We can only take the PutImage fastpath when the region
+ contatins the rectangle completely.
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65964
+ Signed-off-by: Michel Dänzer <michel.daen...@amd.com>
+ Reviewed-by: Zhigang Gong <zhigang.g...@linux.intel.com>
+
+diff --git a/src/glamor_putimage.c b/src/glamor_putimage.c
+index 34e86a1..6567f14 100644
+--- a/src/glamor_putimage.c
++++ b/src/glamor_putimage.c
+@@ -287,7 +287,7 @@ _glamor_put_image(DrawablePtr drawable, GCPtr gc, int
depth, int x, int y,
+ box.x2 = x + w + drawable->x;
+ box.y2 = y + h + drawable->y;
+
+- if ((clip != NULL && !RegionContainsRect(clip, &box))
++ if ((clip != NULL && RegionContainsRect(clip, &box) != rgnIN)
+ || gc->alu != GXcopy) {
+ temp_pixmap = glamor_create_pixmap(drawable->pScreen, w, h,
depth, 0);
+ if (temp_pixmap == NULL)
diff --git a/debian/patches/series b/debian/patches/series
index a82d1b4..d92f925 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#placeholder
+fix-fdo65964.diff
--
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/e1vn54b-0001fh...@vasks.debian.org
