compiz-fusion-plugins-main: Changes to 'debian-unstable'
debian/control | 3 ++-
debian/patches/nvidia-workaround.patch | 29 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 11 +++++++++--
4 files changed, 41 insertions(+), 3 deletions(-)
New commits:
commit 7643e42048c7c02cbebd335733a83f7205ff697b
Author: Sean Finney <seanius@debian.org>
Date: Thu Apr 9 18:29:32 2009 +0200
new patch: nvidia-workaround.patch for redraw issue with nvidia cards.
Closes: #519729
Thanks: Alex Goebel <alex.goebel@gmail.com>, Dmitriy Trt <dmitriy.trt@gmail.com>
diff --git a/debian/patches/nvidia-workaround.patch b/debian/patches/nvidia-workaround.patch
new file mode 100644
index 0000000..0bc6507
--- /dev/null
+++ b/debian/patches/nvidia-workaround.patch
@@ -0,0 +1,29 @@
+debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=519729
+forum discussions: http://www.nvnews.net/vbulletin/showthread.php?t=129711
+derived from: http://gitweb.compiz-fusion.org/?p=fusion/plugins/workarounds;a=commit;h=46960f12a9d213e5f0e841557e2ed2f7ea18cc79
+--- 5-compiz-fusion-plugins-main.orig/metadata/workarounds.xml.in
++++ 5-compiz-fusion-plugins-main/metadata/workarounds.xml.in
+@@ -53,6 +53,11 @@
+ <_long>Fix for broken GLX_MESA_copy_sub_buffer on XGL in fglrx.</_long>
+ <default>false</default>
+ </option>
++ <option type="bool" name="force_glx_sync">
++ <_short>Force synchronization between X and GLX</_short>
++ <_long>Force synchronization between X and GLX, which may help for window parts not redrawing correctly when using Nvidia drivers, but also may decrease performance.</_long>
++ <default>false</default>
++ </option>
+ <subgroup>
+ <_short>Window stickyness</_short>
+ <option type="bool" name="sticky_alldesktops">
+--- 5-compiz-fusion-plugins-main.orig/src/workarounds/workarounds.c
++++ 5-compiz-fusion-plugins-main/src/workarounds/workarounds.c
+@@ -198,6 +198,9 @@ workaroundsPaintScreen (CompScreen *s,
+
+ currentScreen = s;
+
++ if (workaroundsGetForceGlxSync (s->display))
++ glXWaitX();
++
+ UNWRAP (ws, s, paintScreen);
+ (*s->paintScreen) (s, outputs, numOutputs, mask);
+ WRAP (ws, s, paintScreen, workaroundsPaintScreen);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..46c8dd0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+nvidia-workaround.patch
commit 789cfdc2d97a6009f8fd1671a682e12a9039b086
Author: Sean Finney <seanius@debian.org>
Date: Thu Apr 9 18:26:13 2009 +0200
add build-dep on quilt
diff --git a/debian/control b/debian/control
index aac2ee1..43810eb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: compiz-fusion-plugins-main
Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Sean Finney <seanius@debian.org>
-Build-Depends: autoconf, automake1.9, autotools-dev, compiz-dev (>= 0.8.2), compiz-fusion-bcop (>= 0.8.2), debhelper (>= 5), intltool, libgconf2-dev, libglib2.0-dev, libtool, libglu1-mesa-dev, libjpeg62-dev, libxml2-dev, libxslt1-dev, pkg-config, xsltproc, libcairo2-dev, libpango1.0-dev, librsvg2-dev, libsm-dev, libdbus-1-dev, libdecoration0-dev
+Build-Depends: autoconf, automake1.9, autotools-dev, compiz-dev (>= 0.8.2), compiz-fusion-bcop (>= 0.8.2), debhelper (>= 5), intltool, libgconf2-dev, libglib2.0-dev, libtool, libglu1-mesa-dev, libjpeg62-dev, libxml2-dev, libxslt1-dev, pkg-config, xsltproc, libcairo2-dev, libpango1.0-dev, librsvg2-dev, libsm-dev, libdbus-1-dev, libdecoration0-dev,
+ quilt
Standards-Version: 3.8.1
Section: x11
diff --git a/debian/rules b/debian/rules
index 7ad01bf..e311b45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,13 @@ else
CFLAGS += -O2
endif
+# include the patch/unpatch rules from quilt
+include /usr/share/quilt/quilt.make
+# specify some options to our patch system
+QUILT_DIFF_OPTS=-p
+QUILT_NO_DIFF_TIMESTAMPS=1
+export QUILT_DIFF_OPTS QUILT_NO_DIFF_TIMESTAMPS
+
# the following files are modified in the build process, but shouldn't be.
UPSTREAM_PRESERVE:=po/Makefile.in.in
@@ -21,7 +28,7 @@ AUTOFOO_DELETE:=aclocal.m4 config.guess config.h.in config.sub configure \
intltool-update.in ltmain.sh missing mkinstalldirs
configure: configure-stamp
-configure-stamp:
+configure-stamp: $(QUILT_STAMPFN)
dh_testdir
for f in $(UPSTREAM_PRESERVE); do \
cp -a $$f $$f.preserve; \
@@ -36,7 +43,7 @@ build-stamp: configure-stamp
$(MAKE)
touch $@
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
Reply to: