rpms/compiz/devel compiz.spec, 1.33, 1.34 fbconfig-depth-fix.patch, 1.3, 1.4

[fedora-cvs-commits at redhat.com]

Author: krh

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14768

Modified Files:
	compiz.spec fbconfig-depth-fix.patch 
Log Message:
* Wed Sep  6 2006 Kristian Høgsberg <krh at redhat.com>
- Update fbconfig-depth-fix.patch to also skip fbconfigs without
  corresponding visuals.



Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- compiz.spec	5 Sep 2006 21:52:45 -0000	1.33
+++ compiz.spec	6 Sep 2006 18:24:35 -0000	1.34
@@ -152,6 +152,10 @@
 %{_includedir}/compiz
 
 %changelog
+* Wed Sep  6 2006 Kristian Høgsberg <krh at redhat.com>
+- Update fbconfig-depth-fix.patch to also skip fbconfigs without
+  corresponding visuals.
+
 * Tue Sep 5 2006 Soren Sandmann <sandmann at redhat.com> - 0.0.13-0.25.20060817git.fc6
 - Make number of vertical size configurable
 

fbconfig-depth-fix.patch:
 screen.c |   12 ++++++++++++
 1 files changed, 12 insertions(+)

Index: fbconfig-depth-fix.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/fbconfig-depth-fix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fbconfig-depth-fix.patch	18 Aug 2006 01:36:27 -0000	1.3
+++ fbconfig-depth-fix.patch	6 Sep 2006 18:24:35 -0000	1.4
@@ -12,7 +12,7 @@
 index 9ec30d5..75c6abc 100644
 --- a/src/screen.c
 +++ b/src/screen.c
-@@ -1309,6 +1309,16 @@ addScreen (CompDisplay *display,
+@@ -1309,6 +1309,18 @@ addScreen (CompDisplay *display,
  
  	for (j = 0; j < nElements; j++)
  	{
@@ -20,6 +20,8 @@
 +	      XVisualInfo *vi;
 +	      int visual_depth;
 +	      vi = glXGetVisualFromFBConfig(dpy, fbConfigs[j]);
++	      if (vi == NULL)
++		continue;
 +	      visual_depth = vi->depth;
 +	      XFree(vi);
 +	      if (visual_depth != i)