|
|
Author: mclasen
Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1119
Modified Files:
compiz.spec cow.patch
Log Message:
use cow
Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- compiz.spec 11 Nov 2006 05:01:06 -0000 1.64
+++ compiz.spec 15 Nov 2006 13:39:15 -0000 1.65
@@ -7,7 +7,7 @@
License: X11/MIT/GPL
Group: User Interface/Desktops
Version: 0.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: OpenGL window and compositing manager
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +48,7 @@
Patch105: fedora-logo.patch
Patch106: glfinish.patch
+Patch107: cow.patch
Patch113: resize-offset.patch
Patch114: restart.patch
@@ -87,6 +88,7 @@
%patch105 -p1 -b .fedora-logo
%patch106 -p1 -b .glfinish
+%patch107 -p1 -b .cow
%patch113 -p1 -b .resize-offset
%patch114 -p1 -b .restart
@@ -194,6 +196,9 @@
%{_includedir}/compiz
%changelog
+* Wed Nov 15 2006 Matthias Clasen <mclasen@xxxxxxxxxx> - 0.3.2-2
+- Use cow by default, bug 208044
+
* Fri Nov 10 2006 Matthias Clasen <mclasen@xxxxxxxxxx> - 0.3.2-1
- Update to 0.3.2
- Drop upstreamed patches
cow.patch:
main.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: cow.patch
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/cow.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cow.patch 30 Aug 2006 02:31:49 -0000 1.1
+++ cow.patch 15 Nov 2006 13:39:15 -0000 1.2
@@ -1,120 +1,11 @@
---- ./src/display.c.cow 2006-08-29 19:48:53.000000000 -0400
-+++ ./src/display.c 2006-08-29 18:11:46.000000000 -0400
-@@ -1998,7 +1998,7 @@
- PAINT_SCREEN_REGION_MASK |
- PAINT_SCREEN_FULL_MASK);
+--- compiz-0.3.2/src/main.c.cow 2006-11-15 08:35:37.000000000 -0500
++++ compiz-0.3.2/src/main.c 2006-11-15 08:37:18.000000000 -0500
+@@ -82,7 +82,7 @@
+ Bool strictBinding = TRUE;
+
+ #ifdef USE_COW
+-Bool useCow = FALSE;
++Bool useCow = TRUE;
+ #endif
-- glXSwapBuffers (s->display->display, s->root);
-+ glXSwapBuffers (s->display->display, s->output);
- }
- else if (s->damageMask & COMP_SCREEN_DAMAGE_REGION_MASK)
- {
-@@ -2022,7 +2022,7 @@
- y = s->height - pBox->y2;
-
- (*s->copySubBuffer) (s->display->display,
-- s->root,
-+ s->output,
- pBox->x1, y,
- pBox->x2 - pBox->x1,
- pBox->y2 - pBox->y1);
-@@ -2071,7 +2071,7 @@
- &s->region,
- PAINT_SCREEN_FULL_MASK);
-
-- glXSwapBuffers (s->display->display, s->root);
-+ glXSwapBuffers (s->display->display, s->output);
- }
- }
-
---- ./src/screen.c.cow 2006-08-29 14:11:48.000000000 -0400
-+++ ./src/screen.c 2006-08-29 18:19:32.000000000 -0400
-@@ -40,6 +40,8 @@
- #include <X11/Xatom.h>
- #include <X11/Xproto.h>
- #include <X11/extensions/Xrandr.h>
-+#include <X11/extensions/Xcomposite.h>
-+#include <X11/extensions/shape.h>
- #include <X11/cursorfont.h>
-
- #include <compiz.h>
-@@ -878,6 +880,25 @@
- (unsigned char *) data, 1);
- }
-
-+static void
-+makeOutputWindow (CompScreen *s)
-+{
-+ Display *dpy = s->display->display;
-+ XserverRegion region;
-+
-+ s->overlay = XCompositeGetOverlayWindow (dpy, s->root);
-+ s->output = s->overlay;
-+
-+ region = XFixesCreateRegion (dpy, NULL, 0);
-+
-+ XFixesSetWindowShapeRegion (dpy,
-+ s->output,
-+ ShapeInput,
-+ 0, 0, region);
-+
-+ XFixesDestroyRegion (dpy, region);
-+}
-+
- Bool
- addScreen (CompDisplay *display,
- int screenNum,
-@@ -1045,6 +1066,8 @@
-
- s->grabWindow = None;
-
-+ makeOutputWindow (s);
-+
- templ.visualid = XVisualIDFromVisual (s->attrib.visual);
-
- visinfo = XGetVisualInfo (dpy, VisualIDMask, &templ, &nvisinfo);
-@@ -1174,7 +1197,7 @@
- s->copySubBuffer = (GLXCopySubBufferProc)
- getProcAddress (s, "glXCopySubBufferMESA");
-
-- glXMakeCurrent (dpy, s->root, s->ctx);
-+ glXMakeCurrent (dpy, s->output, s->ctx);
- currentRoot = s->root;
-
- glExtensions = (const char *) glGetString (GL_EXTENSIONS);
-@@ -2844,7 +2867,7 @@
- {
- if (currentRoot != s->root)
- {
-- glXMakeCurrent (s->display->display, s->root, s->ctx);
-+ glXMakeCurrent (s->display->display, s->output, s->ctx);
- currentRoot = s->root;
-
- s->pendingCommands = TRUE;
---- ./include/compiz.h.cow 2006-08-29 19:36:02.000000000 -0400
-+++ ./include/compiz.h 2006-08-29 15:46:43.000000000 -0400
-@@ -1288,6 +1288,8 @@
- Region damage;
- unsigned long damageMask;
- Window root;
-+ Window overlay;
-+ Window output;
- XWindowAttributes attrib;
- Window grabWindow;
- CompFBConfig glxPixmapFBConfigs[MAX_DEPTH + 1];
---- ./src/event.c.cow 2006-08-29 21:37:29.000000000 -0400
-+++ ./src/event.c 2006-08-29 21:39:03.000000000 -0400
-@@ -1145,7 +1145,12 @@
- s = findScreenAtDisplay (d, event->xcreatewindow.parent);
- if (s)
- {
-- addWindow (s, event->xcreatewindow.window, getTopWindow (s));
-+ /* The first time some client asks for the composite
-+ * overlay window, the X server creates it, which causes
-+ * an errorneous CreateNotify event. We catch it and
-+ * ignore it. */
-+ if (s->overlay != event->xcreatewindow.window)
-+ addWindow (s, event->xcreatewindow.window, getTopWindow (s));
- }
- break;
- case DestroyNotify:
+ static void
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|