Added another patch.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 60 insertions, 2 deletions

diff --git a/x11-plugins/compiz-plugins-main/ChangeLog b/x11-plugins/compiz-plugins-main/ChangeLog
index c896ba39a121..5eaecc02ed62 100644
--- a/x11-plugins/compiz-plugins-main/ChangeLog
+++ b/x11-plugins/compiz-plugins-main/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/compiz-plugins-main
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.2 2009/04/03 16:57:43 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-main/ChangeLog,v 1.3 2009/04/03 17:01:59 jmbsvicetto Exp $
+
+  03 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +files/compiz-plugins-main-0.8.2-xdamage-race.patch,
+  +files/compiz-plugins-main-no-gconf.patch:
+  Added another patch.
 
   03 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   +files/compiz-plugins-main-0.8.2-xdamage-race.patch:
diff --git a/x11-plugins/compiz-plugins-main/Manifest b/x11-plugins/compiz-plugins-main/Manifest
index 27a7f1ee9555..c4fbcbdbc107 100644
--- a/x11-plugins/compiz-plugins-main/Manifest
+++ b/x11-plugins/compiz-plugins-main/Manifest
@@ -1,5 +1,6 @@
 AUX compiz-plugins-main-0.8.2-xdamage-race.patch 1346 RMD160 b5ae8613aec891ef25f400007c4a3ab65343dfda SHA1 27611c3372831413571f1c821d114cd02563f3a0 SHA256 44d36e8a6113432bc93cf674ad96509dfc94a4fd804dbfc00c75625f49d1d500
+AUX compiz-plugins-main-no-gconf.patch 586 RMD160 1222325cbec30e35030c930cd3a9358a3b975047 SHA1 95ef3484e60b4f3c4d0bced6b0fb654e7cbcff89 SHA256 bc13b648e2198dd3611ba4f4734540903a740570a2c181dc666dd1e66f13e1da
 DIST compiz-plugins-main-0.8.2.tar.bz2 1169127 RMD160 36e0a258ff8287df2d517607c37f4df2b5e62725 SHA1 d733604cda891a95f8cb451bf70cb1ff8fd3f7c2 SHA256 d1c71500d4b84ac3a3767f0eb498bbfe22b8abcac8bc71dac6c7696de493ff1e
 EBUILD compiz-plugins-main-0.8.2.ebuild 1027 RMD160 3e0d5aaaef0ec9b9f14291fd6fad82be0747fd86 SHA1 27ee586150a953eedf57618f803fe668cd9be98a SHA256 93aec722445a75303a7a97458117bd80d96c8185fba15926ace078a4bef72a9c
-MISC ChangeLog 586 RMD160 f3fccbc7e239bbee9c4fd6c05c4f00521a89728a SHA1 13ba5f4557428da7b3e0bb1702b81c0a03296059 SHA256 3e179b6383fb5fb414fc4c4363f6787d02320faf445cace93356b567ee4b8fa2
+MISC ChangeLog 777 RMD160 3d9e9e61ad52660ff9a3ef8746582c6ce7b6e547 SHA1 2a4c2c4b2eaac47124ccc2d8686b304cc8c3baa3 SHA256 b08a248d64083eaa02c57dbff02ef1b3b3d0b06406a0bf60d591826300f1e395
 MISC metadata.xml 423 RMD160 ed3e1c4f2fcef78faf6d8b85b337f60b69c582f1 SHA1 554188b456adfdd2be58a825b83f5a2f75a1070e SHA256 63a22d1439257bac17c3a4e5a045bc2e07fbd13bde371f72cecdd0bd5cbe8742
diff --git a/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-0.8.2-xdamage-race.patch b/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-0.8.2-xdamage-race.patch
new file mode 100644
index 000000000000..ee167b8319c9
--- /dev/null
+++ b/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-0.8.2-xdamage-race.patch
@@ -0,0 +1,30 @@
+diff --git a/src/workarounds/workarounds.c b/src/workarounds/workarounds.c
+index 5e0c221..f987fa0 100644
+--- a/src/workarounds/workarounds.c
++++ b/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/metadata/workarounds.xml.in b/metadata/workarounds.xml.in
+index 5eb072d..1648e88 100644
+--- a/metadata/workarounds.xml.in
++++ b/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">
diff --git a/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-no-gconf.patch b/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-no-gconf.patch
new file mode 100644
index 000000000000..63222a5f1ce6
--- /dev/null
+++ b/x11-plugins/compiz-plugins-main/files/compiz-plugins-main-no-gconf.patch
@@ -0,0 +1,22 @@
+ configure.ac |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 297a8cf..290e92b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -171,11 +171,10 @@
+ if test x"$use_schemas" = x"yes"; then
+   fi
+   xsltdir=`$PKG_CONFIG --variable=xsltdir compiz-gconf`
+   AC_SUBST(xsltdir)
++else
++  AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test "x$use_gconf" = "xyes")
+ fi
+ 
+-AM_GCONF_SOURCE_2
+-
+-
+ AM_CONDITIONAL(USE_SCHEMAS, test "x$use_schemas" = "xyes")
+ if test "$use_schemas" = yes; then
+   AC_DEFINE(USE_SCHEMAS, 1, [Build gconf schemas])