xorg-server: Changes to 'ubuntu'
debian/changelog | 28 +++++++++------
debian/patches/217_revert_bgnonevisitwindow.patch | 41 ++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 60 insertions(+), 10 deletions(-)
New commits:
commit 1d7b741874928ec4e330c1b91a67fc5e7fb611df
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Mar 24 18:14:20 2011 -0700
Bump
diff --git a/debian/changelog b/debian/changelog
index def4a5b..b907d39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ xorg-server (2:1.10.0-0ubuntu2) natty; urgency=low
windows display graphical corruption briefly.
(LP: #726807)
- -- Bryce Harrington <bryce@ubuntu.com> Thu, 24 Mar 2011 15:16:12 -0700
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 24 Mar 2011 15:27:40 -0700
xorg-server (2:1.10.0-0ubuntu1) natty; urgency=low
commit f22ac83405ca4cb43af124bf56d5199d8dfa1139
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Mar 24 15:26:47 2011 -0700
Bump for release
diff --git a/debian/changelog b/debian/changelog
index cea5d26..def4a5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
-xorg-server (2:1.10.0-0ubuntu2) UNRELEASED; urgency=low
+xorg-server (2:1.10.0-0ubuntu2) natty; urgency=low
+ [Chase Douglas]
* patches/500_xi2.1.patch: Process ownership properly when activating an
async passive grab (LP: #733483)
- -- Chase Douglas <chase.douglas@ubuntu.com> Fri, 18 Mar 2011 11:08:13 -0400
+ [Bryce Harrington]
+ * 217_revert_bgnonevisitwindow.patch: Cherrypick from upstream. Drops
+ recent change that inhibits drawing backfill for non-bg-None windows.
+ This causes a regression on -ati (at least) where menus and other
+ windows display graphical corruption briefly.
+ (LP: #726807)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 24 Mar 2011 15:16:12 -0700
xorg-server (2:1.10.0-0ubuntu1) natty; urgency=low
commit a77466ca6d25ac10b694bf3eb15fcd455b9483c1
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Mar 24 15:25:09 2011 -0700
Patch from upstream to revert commit 6dd775f which causes some graphics
corruption in menus on -ati.
diff --git a/debian/changelog b/debian/changelog
index 21d73c5..cea5d26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
xorg-server (2:1.10.0-0ubuntu2) UNRELEASED; urgency=low
- * Process ownership properly when activating an async passive grab
- (LP: #733483)
+ * patches/500_xi2.1.patch: Process ownership properly when activating an
+ async passive grab (LP: #733483)
-- Chase Douglas <chase.douglas@ubuntu.com> Fri, 18 Mar 2011 11:08:13 -0400
xorg-server (2:1.10.0-0ubuntu1) natty; urgency=low
-
+
* Update to new upstream final release.
+ Drop 16-construct-paths-in-doxygen.conf.diff; included in new upstream.
* debian/patches/216_fix_sdksyms_build.diff:
@@ -84,20 +84,20 @@ xorg-server (2:1.10.0-0ubuntu1) natty; urgency=low
+ 215_glx_drawable_refcounting.diff:
Prevents segfault on logout and server regenerate, and possibly other
times. (LP #711422)
- + 500_xi2.1.patch:
- + 501_xf86CoordinatesToWindow.patch:
- + 502_gestures-extension.patch:
+ + 500_xi2.1.patch,
+ 501_xf86CoordinatesToWindow.patch,
+ 502_gestures-extension.patch:
Add Xi 2.1 and Gesture extension support.
* debian/serverminver:
- Bump to 1.10.0-0ubuntu1~ for Xi 2.1 ABI
- * New upstream release fixes crash in Record, trigerred by x11vnc
+ * New upstream release fixes crash in Record, trigerred by x11vnc
(LP: #525066)
* Refresh 500_xi2.1.patch for new upstream version
* debian/videoabiver:
- Bump to 10 for XRandR 1.4 revert.
-- Christopher James Halse Rogers <raof@ubuntu.com> Fri, 11 Mar 2011 10:29:37 +1100
-
+
xorg-server (2:1.9.99.903-2) UNRELEASED; urgency=low
* Relax build-dep and dep on x11proto-randr-dev since the XRandR 1.4
diff --git a/debian/patches/217_revert_bgnonevisitwindow.patch b/debian/patches/217_revert_bgnonevisitwindow.patch
new file mode 100644
index 0000000..8e977be
--- /dev/null
+++ b/debian/patches/217_revert_bgnonevisitwindow.patch
@@ -0,0 +1,41 @@
+From: Ian Pilcher <arequipeno@gmail.com>
+Subject: Backout commit 6dd775f57d2f94f0ddaee324aeec33b9b66ed5bc
+
+--- a/composite/compalloc.c 2010-11-30 17:58:29.000000000 -0600
++++ b/composite/compalloc.c 2011-02-26 12:15:20.167570918 -0600
+@@ -472,17 +472,6 @@
+ return Success;
+ }
+
+-static int
+-bgNoneVisitWindow(WindowPtr pWin, void *null)
+-{
+- if (pWin->backgroundState != BackgroundPixmap)
+- return WT_WALKCHILDREN;
+- if (pWin->background.pixmap != None)
+- return WT_WALKCHILDREN;
+-
+- return WT_STOPWALKING;
+-}
+-
+ static PixmapPtr
+ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)
+ {
+@@ -504,17 +493,6 @@
+ return pPixmap;
+
+ /*
+- * If there's no bg=None in the tree, we're done.
+- *
+- * We could optimize this more by collection the regions of all the
+- * bg=None subwindows and feeding that in as the clip for the
+- * CopyArea below, but since window trees are shallow these days it
+- * might not be worth the effort.
+- */
+- if (TraverseTree(pWin, bgNoneVisitWindow, NULL) == WT_NOMATCH)
+- return pPixmap;
+-
+- /*
+ * Copy bits from the parent into the new pixmap so that it will
+ * have "reasonable" contents in case for background None areas.
+ */
diff --git a/debian/patches/series b/debian/patches/series
index 7853868..780f10f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,6 +33,7 @@
214_glx_dri_searchdirs.patch
215_glx_drawable_refcounting.diff
216_fix_sdksyms_build.diff
+217_revert_bgnonevisitwindow.patch
500_xi2.1.patch
501_xf86CoordinatesToWindow.patch
502_gestures-extension.patch
Reply to: