compiz: Changes to 'debian-unstable'
debian/changelog | 8 ++++++++
debian/control | 2 +-
debian/patches/series | 1 +
debian/patches/xscreensaver-damage-fix.patch | 20 ++++++++++++++++++++
4 files changed, 30 insertions(+), 1 deletion(-)
New commits:
commit 0e71390214559e897209641647a7abbde4568530
Author: Sean Finney <seanius@debian.org>
Date: Sun Aug 31 09:55:26 2008 +0200
remove conflicts on xscreensaver-data
diff --git a/debian/control b/debian/control
index 462cbbf..bc9af64 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Description: OpenGL window and compositing manager
Package: compiz-core
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, mesa-utils
-Conflicts: libcompizconfig0 (<< 0.7.6), xscreensaver-data-extra
+Conflicts: libcompizconfig0 (<< 0.7.6)
Recommends: compiz-plugins (= ${binary:Version})
Suggests: nvidia-glx (>= 1.0.9625-1)
Description: OpenGL window and compositing manager
commit b5bf409b78c19a5f45c720d68358e7b02c50553b
Author: Sean Finney <seanius@debian.org>
Date: Sun Aug 31 09:53:28 2008 +0200
backport aed97c441881d9c382c7865d0305fc8f884c10ac
diff --git a/debian/changelog b/debian/changelog
index 1706363..8e255b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+compiz (0.7.6-6) unstable; urgency=high
+
+ * backport commit aed97c441881d9c382c7865d0305fc8f884c10ac to fix the
+ problems that seem to come up with certain xscreensavers the Right Way.
+ (closes: #483170).
+
+ -- Sean Finney <seanius@debian.org> Sat, 30 Aug 2008 11:39:17 +0200
+
compiz (0.7.6-5) unstable; urgency=high
* Brown paper bag: remove shlibs.local and libdecoration0.shlibs, call
diff --git a/debian/patches/series b/debian/patches/series
index fa7462d..7228035 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
compiz-manager-posixly-correct.patch
compiz-manager-nvidia-settings-optional.patch
disable-libx11-xcb-support.patch
+xscreensaver-damage-fix.patch
diff --git a/debian/patches/xscreensaver-damage-fix.patch b/debian/patches/xscreensaver-damage-fix.patch
new file mode 100644
index 0000000..4509cc8
--- /dev/null
+++ b/debian/patches/xscreensaver-damage-fix.patch
@@ -0,0 +1,20 @@
+imported from upstream commit aed97c441881d9c382c7865d0305fc8f884c10ac
+fixes #483170
+diff --git a/src/screen.c b/src/screen.c
+index 2b7c914..807699b 100644
+--- a/src/screen.c
++++ b/src/screen.c
+@@ -2401,6 +2401,13 @@ damageScreenRegion (CompScreen *screen,
+ XUnionRegion (screen->damage, region, screen->damage);
+
+ screen->damageMask |= COMP_SCREEN_DAMAGE_REGION_MASK;
++
++ /* if the number of damage rectangles grows two much between repaints,
++ we have a lot of overhead just for doing the damage tracking -
++ in order to make sure we're not having too much overhead, damage
++ the whole screen if we have a lot of damage rects */
++ if (screen->damage->numRects > 100)
++ damageScreen (screen);
+ }
+
+ void
Reply to: