commit compiz for openSUSE:Factory

26 Feb 2009

Hello community,

here is the log from the commit of package compiz for openSUSE:Factory
checked in at Thu Feb 26 12:56:49 CET 2009.


--------
--- compiz/compiz.changes	2009-02-12 21:06:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/compiz/compiz.changes	2009-02-26 00:53:46.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Feb 25 18:42:02 EST 2009 - davidr@novell.com
+
+- Fix gconf plugin. (bnc#479749)
+
+-------------------------------------------------------------------
+Tue Feb 24 19:51:25 EST 2009 - davidr@novell.com
+
+- Never use the libgl fallback for server vendor DMX. (bnc#479303)
+- Never allow glx plugin to load for server vendor DMX. (bnc#479303)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  compiz-dmx-ignore-glx.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ compiz.spec ++++++
--- /var/tmp/diff_new_pack.lN3855/_old	2009-02-26 12:56:36.000000000 +0100
+++ /var/tmp/diff_new_pack.lN3855/_new	2009-02-26 12:56:36.000000000 +0100
@@ -44,7 +44,7 @@
 %endif
 AutoReqProv:    on
 Version:        0.7.8 
-Release:        29
+Release:        33
 Requires:       compiz-decorator = %{version} compiz-branding = %{version}
 Provides:       windowmanager
 Summary:        OpenGL window and compositing manager.
@@ -75,6 +75,7 @@
 Patch62:        bug-449168-avoid-independent-output-painting.diff
 Patch63:        bug-474862-allow-moving-focus-to-fs-window.diff
 Patch64:        bug-475349-moveInputFocusToOtherWindow.diff
+Patch65:        compiz-dmx-ignore-glx.diff
 Patch80:        compiz-0.7.8-NOMAD.diff
 %if "%(xft-config --prefix)" == "/usr"
 %define xorg_prefix %_prefix
@@ -258,6 +259,7 @@
 %patch62 -p1
 %patch63 -p1
 %patch64 -p1
+%patch65 -p1
 cd -
 
 %build
@@ -434,6 +436,11 @@
 %_datadir/compiz/sle.png
 
 %changelog
+* Wed Feb 25 2009 davidr@novell.com
+- Fix gconf plugin. (bnc#479749)
+* Tue Feb 24 2009 davidr@novell.com
+- Never use the libgl fallback for server vendor DMX. (bnc#479303)
+- Never allow glx plugin to load for server vendor DMX. (bnc#479303)
 * Thu Feb 12 2009 davidr@novell.com
 - Don't lose input focus when closing active window. (bnc#475349)
 * Wed Feb 11 2009 davidr@novell.com

++++++ compiz-0.7.8-NOMAD.diff ++++++
--- /var/tmp/diff_new_pack.lN3855/_old	2009-02-26 12:56:37.000000000 +0100
+++ /var/tmp/diff_new_pack.lN3855/_new	2009-02-26 12:56:37.000000000 +0100
@@ -4586,24 +4586,62 @@
  
      fd = malloc (sizeof (FadeDisplay));
 diff --git a/plugins/gconf.c b/plugins/gconf.c
-index 8d365e0..abb94b6 100644
+index 8d365e0..98094d8 100644
 --- a/plugins/gconf.c
 +++ b/plugins/gconf.c
-@@ -701,12 +701,12 @@ gconfSendGLibNotify (CompDisplay *d)
+@@ -691,22 +691,23 @@ gconfKeyChanged (GConfClient *client,
+ }
+ 
+ static void
+-gconfSendGLibNotify (CompDisplay *d)
++gconfSendGLibNotify (CompScreen *s)
+ {
+-    Display *dpy = d->display;
+-    XEvent  xev;
++    CompDisplay *d = s->display;
++    Display     *dpy = d->display;
++    XEvent      xev;
+ 
+     xev.xclient.type    = ClientMessage;
+     xev.xclient.display = dpy;
      xev.xclient.format  = 32;
  
      xev.xclient.message_type = XInternAtom (dpy, "_COMPIZ_GLIB_NOTIFY", 0);
 -    xev.xclient.window	     = d->screens->root;
-+    xev.xclient.window	     = d->screens->root.id;
++    xev.xclient.window	     = s->root.id;
  
      memset (xev.xclient.data.l, 0, sizeof (xev.xclient.data.l));
  
      XSendEvent (dpy,
 -		d->screens->root,
-+		d->screens->root.id,
++		s->root.id,
  		FALSE,
  		SubstructureRedirectMask | SubstructureNotifyMask,
  		&xev);
+@@ -767,10 +768,10 @@ gconfFiniCore (CompPlugin *p,
+ }
+ 
+ static Bool
+-gconfInitDisplay (CompPlugin  *p,
+-		  CompDisplay *d)
++gconfInitScreen (CompPlugin *p,
++		 CompScreen *s)
+ {
+-    gconfSendGLibNotify (d);
++    gconfSendGLibNotify (s);
+ 
+     return TRUE;
+ }
+@@ -781,7 +782,8 @@ gconfInitObject (CompPlugin *p,
+ {
+     static InitPluginObjectProc dispTab[] = {
+ 	(InitPluginObjectProc) gconfInitCore,
+-	(InitPluginObjectProc) gconfInitDisplay
++	(InitPluginObjectProc) NULL,
++	(InitPluginObjectProc) gconfInitScreen
+     };
+ 
+     RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), TRUE, (p, o));
 diff --git a/plugins/glx.c b/plugins/glx.c
 new file mode 100644
 index 0000000..5bf6274

++++++ compiz-dmx-ignore-glx.diff ++++++

diff --git a/plugins/glx.c b/plugins/glx.c
index 5bf6274..bb115d2 100644
--- a/plugins/glx.c
+++ b/plugins/glx.c
@@ -45,6 +45,13 @@ glxInitDisplay (CompPlugin  *p,
     if (!checkPluginABI ("core", CORE_ABIVERSION))
 	return FALSE;
 
+    if (strstr (ServerVendor (d->display), "DMX"))
+    {
+	compLogMessage (p->vTable->name, CompLogLevelError,
+			"Server vendor is DMX. Ignoring GLX.");
+	return FALSE;
+    }
+
     if (!glXQueryExtension (d->display, &error, &event))
     {
 	compLogMessage (p->vTable->name, CompLogLevelError,
++++++ compiz-ldpreload-indirect.diff ++++++
--- /var/tmp/diff_new_pack.lN3855/_old	2009-02-26 12:56:37.000000000 +0100
+++ /var/tmp/diff_new_pack.lN3855/_new	2009-02-26 12:56:37.000000000 +0100
@@ -1,3 +1,5 @@
+diff --git a/src/display.c b/src/display.c
+index 72515b6..99d3e96 100644
 --- a/src/display.c
 +++ b/src/display.c
 @@ -30,6 +30,8 @@
@@ -18,10 +20,13 @@
  static unsigned int virtualModMask[] = {
      CompAltMask, CompMetaMask, CompSuperMask, CompHyperMask,
      CompModeSwitchMask, CompNumLockMask, CompScrollLockMask
-@@ -2055,6 +2059,26 @@ addDisplay (const char *name)
+@@ -2048,6 +2052,29 @@ addDisplay (const char *name)
  					     COMP_DISPLAY_OPTION_NUM))
  	return FALSE;
  
++    if (strstr (ServerVendor (dpy), "DMX"))
++	libGLFallback = 0;
++
 +    if (libGLFallback)
 +    {
 +	const char *vendor;




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)