debian/patches/015_optional-fbo.patch | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
New commits:
commit 3439bcea670a683f29279dc6d26b2aad484e885e
Author: Thierry Reding <[EMAIL PROTECTED]>
Date: Wed Jan 3 13:14:15 2007 +0100
Fix the 015_optional-fbo patch.
Declare the noFBO variable src/screen.c so it can be used in that file.
diff --git a/debian/patches/015_optional-fbo.patch
b/debian/patches/015_optional-fbo.patch
index 011181e..217f6b4 100644
--- a/debian/patches/015_optional-fbo.patch
+++ b/debian/patches/015_optional-fbo.patch
@@ -1,8 +1,8 @@
-diff --git a/src/main.c b/src/main.c
-index bf1d5d1..4f5bab3 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -81,6 +81,7 @@ Bool replaceCurrentWm = FALSE;
+Index: compiz.git/src/main.c
+===================================================================
+--- compiz.git.orig/src/main.c 2007-01-03 12:39:16.000000000 +0100
++++ compiz.git/src/main.c 2007-01-03 13:09:29.000000000 +0100
+@@ -81,6 +81,7 @@
Bool indirectRendering = FALSE;
Bool strictBinding = TRUE;
Bool noDetection = FALSE;
@@ -10,7 +10,7 @@ index bf1d5d1..4f5bab3 100644
#ifdef USE_COW
Bool useCow = TRUE;
-@@ -100,6 +101,7 @@ usage (void)
+@@ -100,6 +101,7 @@
"[--sm-disable] "
"[--sm-client-id ID] "
"[--no-detection] "
@@ -18,7 +18,7 @@ index bf1d5d1..4f5bab3 100644
"[--version]\n "
#ifdef USE_COW
-@@ -196,6 +198,10 @@ main (int argc, char **argv)
+@@ -196,6 +198,10 @@
{
strictBinding = FALSE;
}
@@ -29,11 +29,20 @@ index bf1d5d1..4f5bab3 100644
#ifdef USE_COW
else if (!strcmp (argv[i], "--use-root-window"))
-diff --git a/src/screen.c b/src/screen.c
-index f0b93e1..db6dad1 100644
---- a/src/screen.c
-+++ b/src/screen.c
-@@ -1804,7 +1804,7 @@ addScreen (CompDisplay *display,
+Index: compiz.git/src/screen.c
+===================================================================
+--- compiz.git.orig/src/screen.c 2007-01-03 13:09:29.000000000 +0100
++++ compiz.git/src/screen.c 2007-01-03 13:10:13.000000000 +0100
+@@ -45,6 +45,8 @@
+
+ #include <compiz.h>
+
++extern Bool noFBO;
++
+ #define DETECT_REFRESH_RATE_DEFAULT TRUE
+
+ #define SCREEN_HSIZE_DEFAULT 4
+@@ -1807,7 +1809,7 @@
}
s->fbo = 0;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
