xserver-xorg-video-nouveau: Changes to 'ubuntu-quantal'
debian/changelog | 7 ++
debian/patches/101-Revert-nouveau-dri2-fix-pixmap-window-offset-calcs.patch | 30 ++++++++++
debian/patches/series | 1
3 files changed, 38 insertions(+)
New commits:
commit d5bb0af2f720c0c3be3ac1fceacdc96152711e63
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Feb 28 12:55:29 2013 +0100
release to quantal proposed without the kwin fix
diff --git a/debian/changelog b/debian/changelog
index 1a4503a..03c8acd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-nouveau (1:1.0.3-0ubuntu0.2) quantal-proposed; urgency=low
+
+ * Revert kwin fix, it caused a regression.
+ - 101-Revert-nouveau-dri2-fix-pixmap-window-offset-calcs.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 28 Feb 2013 12:35:09 +0100
+
xserver-xorg-video-nouveau (1:1.0.3-0ubuntu0.1) quantal-proposed; urgency=low
[ Maarten Lankhorst ]
diff --git a/debian/patches/101-Revert-nouveau-dri2-fix-pixmap-window-offset-calcs.patch b/debian/patches/101-Revert-nouveau-dri2-fix-pixmap-window-offset-calcs.patch
new file mode 100644
index 0000000..a91a770
--- /dev/null
+++ b/debian/patches/101-Revert-nouveau-dri2-fix-pixmap-window-offset-calcs.patch
@@ -0,0 +1,30 @@
+From a8eb53e3df94199be59ca59d19543b233d49bc2f Mon Sep 17 00:00:00 2001
+From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+Date: Thu, 28 Feb 2013 12:33:43 +0100
+Subject: [PATCH] Revert "nouveau/dri2: fix pixmap/window offset calcs."
+
+This reverts commit 297fd0d0755bda698be1d0b30cc60a41d7673c0b.
+---
+ src/nouveau_dri2.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
+index 8d21dca..bf69505 100644
+--- a/src/nouveau_dri2.c
++++ b/src/nouveau_dri2.c
+@@ -165,9 +165,9 @@ nouveau_dri2_copy_region2(ScreenPtr pScreen, DrawablePtr pDraw, RegionPtr pRegio
+ translate = TRUE;
+
+ if (translate && pDraw->type == DRAWABLE_WINDOW) {
+- PixmapPtr pPix = get_drawable_pixmap(pDraw);
+- off_x = pDraw->x - pPix->screen_x;
+- off_y = pDraw->y - pPix->screen_y;
++ WindowPtr pWin = (WindowPtr)pDraw;
++ off_x = pWin->origin.x;
++ off_y = pWin->origin.y;
+ }
+
+ pGC = GetScratchGC(pDraw->depth, pScreen);
+--
+1.8.1.1
+
diff --git a/debian/patches/series b/debian/patches/series
index e8e209c..8404ed3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
# Ubuntu patches
100-vblank-on.diff
+101-Revert-nouveau-dri2-fix-pixmap-window-offset-calcs.patch
Reply to: