compiz: Changes to 'debian-unstable'
debian/changelog | 18 ++++++++++++++
debian/compiz-core.README.Debian | 6 ----
debian/control | 5 ++--
debian/patches/015_optional-fbo.patch | 16 ++++++------
debian/patches/compiz-manager-posixly-correct.patch | 15 ++++++++++++
debian/patches/series | 1
debian/shlibs.local | 1
plugins/cube.c | 10 ++++----
plugins/decoration.c | 1
src/window.c | 25 ++++++++++----------
10 files changed, 65 insertions(+), 33 deletions(-)
New commits:
commit ad34497e49a7ceaffdd48de33a9d3efcfdd48011
Author: Sean Finney <seanius@debian.org>
Date: Sat Dec 22 12:04:30 2007 +0100
new upstream snapshot, lintian fixes, etc.
diff --git a/debian/changelog b/debian/changelog
index 97f47c6..ea49635 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+compiz (0.6.3~git20071222.061ff159-1) unstable; urgency=low
+
+ * New upstream (git snapshot) release. Refreshed quilt patches.
+ * Remove build-dependency on libfuse-dev, since we explicitly disable the
+ fuse plugin and it causes FTBFS on non-linux arches. It should also make
+ backporting easier (closes: #451149, #455516).
+ * compiz-manager-posixly-correct.patch: fix from Brian Carlson to get
+ compiz-manager to run when POSIXLY_CORRECT is set (always pass
+ options before arguments closes: #456628).
+ * Remove libmetacity entry from shlibs override (closes: #455515) Thanks to
+ Rober Millan for noticing this.
+ * Remove outdated info in README.Debian for compiz-core (closes: #454340).
+ * lintian:
+ - Standards-Version to 3.7.3
+ - libdecoration0-dev to section libdevel
+
+ -- Sean Finney <seanius@debian.org> Sat, 22 Dec 2007 12:01:54 +0100
+
compiz (0.6.3~git20071208.25941d14-1) unstable; urgency=low
[Sean Finney]
diff --git a/debian/compiz-core.README.Debian b/debian/compiz-core.README.Debian
index ed618a8..9a50a73 100644
--- a/debian/compiz-core.README.Debian
+++ b/debian/compiz-core.README.Debian
@@ -1,9 +1,3 @@
-compiz - 0.0.13+git20060928
-===========================
-
-This version of compiz was checked out from the upstream git repository at
-git://anongit.freedesktop.org/git/xorg/app/compiz on September 28, 2006.
-
Xorg Server Configuration
=========================
diff --git a/debian/control b/debian/control
index 6be6530..3dff286 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Thierry Reding <thierry@gilfi.de>, David Nusinow <dnusinow@debian.org>, Sean Finney <seanius@debian.org>
Build-Depends: autoconf, automake1.9, autotools-dev,
debhelper (>= 5), intltool, kdebase-dev, libcairo-dev, libdbus-qt-1-dev,
- libdbus-glib-1-dev, libfuse-dev (>= 2.7.0), libgconf2-dev,
+ libdbus-glib-1-dev, libgconf2-dev,
libgl1-mesa-dev (>= 6.5.1) | libgl-dev, libglib2.0-dev, libgnome-desktop-dev,
libgnome-window-settings-dev, libgtk2.0-dev, libice-dev (>= 1:1.0.1),
libmetacity-dev, libpango1.0-dev, libpng12-dev | libpng-dev, librsvg2-dev,
@@ -13,7 +13,7 @@ Build-Depends: autoconf, automake1.9, autotools-dev,
libxdamage-dev (>=1:1.0.3), libxfixes-dev (>= 1:4.0.1), libxinerama-dev,
libxml-parser-perl, libxrandr-dev (>= 2:1.1.0.2), libxrender-dev (>= 1:0.9.1),
quilt (>= 0.40), x11proto-gl-dev (>= 1.4.8-1), xsltproc
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Package: compiz
Architecture: all
@@ -110,6 +110,7 @@ Description: Compiz window decoration library
like gtk-window-decorator and kde-window-decorator.
Package: libdecoration0-dev
+Section: libdevel
Architecture: any
Depends: libdecoration0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libx11-dev, libxrender-dev
Description: Compiz window decoration library - development files
diff --git a/debian/patches/015_optional-fbo.patch b/debian/patches/015_optional-fbo.patch
index b067b46..a37e24a 100644
--- a/debian/patches/015_optional-fbo.patch
+++ b/debian/patches/015_optional-fbo.patch
@@ -1,8 +1,8 @@
Index: compiz/include/compiz.h
===================================================================
---- compiz.orig/include/compiz.h 2007-08-18 21:41:20.000000000 -0700
-+++ compiz/include/compiz.h 2007-08-18 23:31:37.000000000 -0700
-@@ -222,6 +222,7 @@
+--- compiz.orig/include/compiz.h 2007-12-22 11:13:38.000000000 +0100
++++ compiz/include/compiz.h 2007-12-22 11:13:49.000000000 +0100
+@@ -226,6 +226,7 @@
extern Bool noDetection;
extern Bool useDesktopHints;
extern Bool onlyCurrentScreen;
@@ -12,8 +12,8 @@ Index: compiz/include/compiz.h
extern char *defaultTextureFilter;
Index: compiz/src/main.c
===================================================================
---- compiz.orig/src/main.c 2007-08-18 21:41:20.000000000 -0700
-+++ compiz/src/main.c 2007-08-18 23:31:37.000000000 -0700
+--- compiz.orig/src/main.c 2007-12-22 11:13:38.000000000 +0100
++++ compiz/src/main.c 2007-12-22 11:13:49.000000000 +0100
@@ -62,6 +62,7 @@
Bool noDetection = FALSE;
Bool useDesktopHints = TRUE;
@@ -43,9 +43,9 @@ Index: compiz/src/main.c
else if (!strcmp (argv[i], "--use-root-window"))
Index: compiz/src/screen.c
===================================================================
---- compiz.orig/src/screen.c 2007-08-18 21:41:20.000000000 -0700
-+++ compiz/src/screen.c 2007-08-18 23:31:37.000000000 -0700
-@@ -1855,7 +1855,7 @@
+--- compiz.orig/src/screen.c 2007-12-22 11:13:38.000000000 +0100
++++ compiz/src/screen.c 2007-12-22 11:13:49.000000000 +0100
+@@ -1877,7 +1877,7 @@
}
s->fbo = 0;
diff --git a/debian/patches/compiz-manager-posixly-correct.patch b/debian/patches/compiz-manager-posixly-correct.patch
new file mode 100644
index 0000000..61bfdb2
--- /dev/null
+++ b/debian/patches/compiz-manager-posixly-correct.patch
@@ -0,0 +1,15 @@
+debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456628
+reported upstream: http://bugs.opencompositing.org/show_bug.cgi?id=708
+Index: compiz/debian/compiz-manager
+===================================================================
+--- compiz.orig/debian/compiz-manager 2007-12-22 11:18:59.000000000 +0100
++++ compiz/debian/compiz-manager 2007-12-22 11:19:29.000000000 +0100
+@@ -150,7 +150,7 @@
+ check_tfp()
+ {
+ verbose "Checking for texture_from_pixmap: "
+- if [ $($GLXINFO 2>/dev/null | grep GLX_EXT_texture_from_pixmap -c) -gt 2 ] ; then
++ if [ $($GLXINFO 2>/dev/null | grep -c GLX_EXT_texture_from_pixmap) -gt 2 ] ; then
+ verbose "present. \n"
+ return 0;
+ else
diff --git a/debian/patches/series b/debian/patches/series
index db2ba04..2dcdef2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
012_snap-by-default.patch
014_fix-no-border-window-shadow.patch
015_optional-fbo.patch
+compiz-manager-posixly-correct.patch
diff --git a/debian/shlibs.local b/debian/shlibs.local
index 37d6ac1..e229d58 100644
--- a/debian/shlibs.local
+++ b/debian/shlibs.local
@@ -1,2 +1 @@
-libmetacity-private 0 libmetacity0 (>= 1:2.15.21)
libdecoration 0 libdecoration0 (>= 0.5.0)
commit 061ff1593052b99d9159f21002c85fbab8abc87e
Author: Dennis Kasprzyk <onestone@opencompositing.org>
Date: Wed Dec 19 17:34:43 2007 +0100
Decorate "menu" window type windows.
diff --git a/plugins/decoration.c b/plugins/decoration.c
index ca49e21..70f1755 100644
--- a/plugins/decoration.c
+++ b/plugins/decoration.c
@@ -720,6 +720,7 @@ decorWindowUpdate (CompWindow *w,
case CompWindowTypeDialogMask:
case CompWindowTypeModalDialogMask:
case CompWindowTypeUtilMask:
+ case CompWindowTypeMenuMask:
case CompWindowTypeNormalMask:
if (w->mwmDecor & (MwmDecorAll | MwmDecorTitle))
decorate = TRUE;
commit 17488d86daffcb554d6f20508172e3a3db15d31b
Author: Dennis Kasprzyk <onestone@opencompositing.org>
Date: Wed Dec 19 17:34:18 2007 +0100
Add window actions "menu" type windows (ex. gimp detached menus).
diff --git a/src/window.c b/src/window.c
index 72a4cac..b0a6525 100644
--- a/src/window.c
+++ b/src/window.c
@@ -637,6 +637,7 @@ recalcWindowActions (CompWindow *w)
actions |= CompWindowActionShadeMask;
break;
case CompWindowTypeUtilMask:
+ case CompWindowTypeMenuMask:
case CompWindowTypeToolbarMask:
actions =
CompWindowActionMoveMask |
commit 77215784e124b45e1fa3c90857e984e0e0aaa1b5
Author: Dennis Kasprzyk <onestone@opencompositing.org>
Date: Wed Dec 19 14:11:37 2007 +0100
Damage window extents correcly of windows with borders.
diff --git a/src/window.c b/src/window.c
index 1f129bf..72a4cac 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1397,33 +1397,33 @@ damageWindowOutputExtents (CompWindow *w)
BoxRec box;
/* top */
- box.x1 = -w->output.left;
- box.y1 = -w->output.top;
- box.x2 = w->width + w->output.right;
- box.y2 = 0;
+ box.x1 = -w->output.left - w->attrib.border_width;
+ box.y1 = -w->output.top - w->attrib.border_width;
+ box.x2 = w->width + w->output.right - w->attrib.border_width;
+ box.y2 = -w->attrib.border_width;
if (box.x1 < box.x2 && box.y1 < box.y2)
addWindowDamageRect (w, &box);
/* bottom */
- box.y1 = w->height;
- box.y2 = box.y1 + w->output.bottom;
+ box.y1 = w->height - w->attrib.border_width;
+ box.y2 = box.y1 + w->output.bottom - w->attrib.border_width;
if (box.x1 < box.x2 && box.y1 < box.y2)
addWindowDamageRect (w, &box);
/* left */
- box.x1 = -w->output.left;
- box.y1 = 0;
- box.x2 = 0;
- box.y2 = w->height;
+ box.x1 = -w->output.left - w->attrib.border_width;
+ box.y1 = -w->attrib.border_width;
+ box.x2 = -w->attrib.border_width;
+ box.y2 = w->height - w->attrib.border_width;
if (box.x1 < box.x2 && box.y1 < box.y2)
addWindowDamageRect (w, &box);
/* right */
- box.x1 = w->width;
- box.x2 = box.x1 + w->output.right;
+ box.x1 = w->width - w->attrib.border_width;
+ box.x2 = box.x1 + w->output.right - w->attrib.border_width;
if (box.x1 < box.x2 && box.y1 < box.y2)
addWindowDamageRect (w, &box);
commit 19791da80df3fa3e4c247b8d4d9d0ef42f4c74f3
Author: Dennis Kasprzyk <onestone@opencompositing.org>
Date: Wed Dec 19 13:00:21 2007 +0100
Draw cube caps correctly in inside cube mode.
diff --git a/plugins/cube.c b/plugins/cube.c
index 14ab2cc..460ae61 100644
--- a/plugins/cube.c
+++ b/plugins/cube.c
@@ -1370,7 +1370,7 @@ cubePaintTransformedOutput (CompScreen *s,
PaintOrder paintOrder;
Bool capsPainted;
Bool wasCulled = FALSE;
- Bool topDir, bottomDir;
+ Bool topDir, bottomDir, allCaps;
int output = 0;
CUBE_SCREEN (s);
@@ -1510,10 +1510,12 @@ cubePaintTransformedOutput (CompScreen *s,
cs->capsPainted[output] = TRUE;
+ allCaps = cs->desktopOpacity != OPAQUE || cs->invert != 1;
+
if (topDir && bottomDir)
{
glNormal3f (0.0f, -1.0f, 0.0f);
- if (cs->desktopOpacity != OPAQUE)
+ if (allCaps)
{
(*cs->paintBottom) (s, &sa, transform, outputPtr, hsize);
glNormal3f (0.0f, 0.0f, -1.0f);
@@ -1525,7 +1527,7 @@ cubePaintTransformedOutput (CompScreen *s,
else if (!topDir && !bottomDir)
{
glNormal3f (0.0f, 1.0f, 0.0f);
- if (cs->desktopOpacity != OPAQUE)
+ if (allCaps)
{
(*cs->paintTop) (s, &sa, transform, outputPtr, hsize);
glNormal3f (0.0f, 0.0f, -1.0f);
@@ -1534,7 +1536,7 @@ cubePaintTransformedOutput (CompScreen *s,
}
(*cs->paintBottom) (s, &sa, transform, outputPtr, hsize);
}
- else if (cs->desktopOpacity != OPAQUE)
+ else if (allCaps)
{
glNormal3f (0.0f, 1.0f, 0.0f);
(*cs->paintTop) (s, &sa, transform, outputPtr, hsize);
Reply to: