rpms/compiz-fusion/devel compiz-0.7.8-x_to_glx_workaround.patch, NONE, 1.1 compiz-fusion.spec, 1.44, 1.45

[Adel Gadllah]

Author: drago01

Update of /cvs/pkgs/rpms/compiz-fusion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9287

Modified Files:
	compiz-fusion.spec 
Added Files:
	compiz-0.7.8-x_to_glx_workaround.patch 
Log Message:
Backport upstream fix for RH #474741

compiz-0.7.8-x_to_glx_workaround.patch:

--- NEW FILE compiz-0.7.8-x_to_glx_workaround.patch ---
diff -upNr compiz-fusion-plugins-main-0.7.8.orign/metadata/workarounds.xml.in compiz-fusion-plugins-main-0.7.8/metadata/workarounds.xml.in
--- compiz-fusion-plugins-main-0.7.8.orign/metadata/workarounds.xml.in	2008-09-17 15:29:14.000000000 +0200
+++ compiz-fusion-plugins-main-0.7.8/metadata/workarounds.xml.in	2009-03-14 17:51:07.383791735 +0100
@@ -53,6 +53,12 @@
                 <_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 -upNr compiz-fusion-plugins-main-0.7.8.orign/src/workarounds/workarounds.c compiz-fusion-plugins-main-0.7.8/src/workarounds/workarounds.c
--- compiz-fusion-plugins-main-0.7.8.orign/src/workarounds/workarounds.c	2008-09-17 15:29:14.000000000 +0200
+++ compiz-fusion-plugins-main-0.7.8/src/workarounds/workarounds.c	2009-03-14 17:49:39.978731517 +0100
@@ -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);


Index: compiz-fusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/compiz-fusion.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- compiz-fusion.spec	24 Feb 2009 08:43:37 -0000	1.44
+++ compiz-fusion.spec	14 Mar 2009 16:57:36 -0000	1.45
@@ -2,7 +2,7 @@
 
 Name: compiz-fusion
 Version: 0.7.8       
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Collection of Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -11,6 +11,8 @@
 Source0: http://releases.compiz-fusion.org/%{version}/%{name}-plugins-main-%{version}.tar.bz2  
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1: compiz-fusion-0.7.6-winrules.patch
+#Upstream commit 46960f12a9d213e5f0e841557e2ed2f7ea18cc79
+Patch2: compiz-0.7.8-x_to_glx_workaround.patch
 # libdrm is not available on these arches
 ExcludeArch: s390 s390x
 
@@ -64,6 +66,7 @@
 %prep
 %setup -q -n %{name}-plugins-main-%{version}
 %patch1 -p1 -b .winrules
+%patch2 -p1 -b .xglx
 
 %build
 %configure --enable-schemas
@@ -134,6 +137,9 @@
 
 
 %changelog
+* Sat Mar 14 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.7.8-7
+- Backport upstream fix for RH #474741
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.8-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild