File compiz-ldpreload-indirect.diff of Package compiz

Overview Repositories Revisions Requests Users Attributes Meta

File compiz-ldpreload-indirect.diff of Package compiz (Revision a998aeb90211101a9872c464eb1dfcc2)

Currently displaying revision a998aeb90211101a9872c464eb1dfcc2 , Show latest

diff -urp ../compiz-0.5.1.orig/src/display.c ./src/display.c
--- ../compiz-0.5.1.orig/src/display.c	2007-07-13 13:46:26.000000000 +0200
+++ ./src/display.c	2007-07-16 17:02:54.000000000 +0200
@@ -43,6 +43,8 @@
 
 #include <compiz.h>
 
+extern Bool noLibGLFallback;
+
 static unsigned int virtualModMask[] = {
     CompAltMask, CompMetaMask, CompSuperMask, CompHyperMask,
     CompModeSwitchMask, CompNumLockMask, CompScrollLockMask
@@ -1989,6 +1991,17 @@ addDisplay (char *name)
 	return FALSE;
     }
 
+    if (!noLibGLFallback)
+    {
+       int major, minor;
+
+       if (!glXQueryVersion (dpy, &major, &minor))
+	   return FALSE;
+
+       if (major < 2 || minor < 4)
+	   return FALSE;
+    }
+
     if (!compInitDisplayOptionsFromMetadata (d,
 					     &coreMetadata,
 					     coreDisplayOptionInfo,
diff -urp ../compiz-0.5.1.orig/src/main.c ./src/main.c
--- ../compiz-0.5.1.orig/src/main.c	2007-07-13 13:46:26.000000000 +0200
+++ ./src/main.c	2007-07-16 17:05:34.000000000 +0200
@@ -67,6 +67,8 @@ Bool onlyCurrentScreen = FALSE;
 Bool useCow = TRUE;
 #endif
 
+Bool noLibGLFallback = FALSE;
+
 CompMetadata coreMetadata;
 
 static void
@@ -366,6 +368,10 @@ main (int argc, char **argv)
 	    if (i + 1 < argc)
 		backgroundImage = argv[++i];
 	}
+	else if (!strcmp (argv[i], "--no-libgl-fallback"))
+	{
+	    noLibGLFallback = TRUE;
+	}
 	else if (*argv[i] == '-')
 	{
 	    compLogMessage (NULL, "core", CompLogLevelWarn,
@@ -432,11 +438,32 @@ main (int argc, char **argv)
 
     compAddMetadataFromFile (&coreMetadata, "core");
 
+    if (noLibGLFallback)
+	unsetenv ("LD_PRELOAD");
+
     if (!disableSm)
 	initSession (clientId);
 
     if (!addDisplay (displayName))
+    {
+	if (!noLibGLFallback)
+	{
+	    char *arg[argc + 2];
+	    static const char *libindirect_libgl = "/usr/$LIB/libIndirectGL.so.1";
+
+	    memcpy (arg, argv, sizeof (char *) * argc);
+
+	    arg[argc] = "--no-libgl-fallback";
+	    arg[argc + 1] = NULL;
+
+	    fprintf (stderr, "%s: Trying '%s'\n", programName, libindirect_libgl);
+
+	    setenv ("LD_PRELOAD", libindirect_libgl, TRUE);
+	    execvp (arg[0], arg);
+	}
+
 	return 1;
+    }
 
     eventLoop ();

Places

File compiz-ldpreload-indirect.diff of Package compiz (Revision a998aeb90211101a9872c464eb1dfcc2)

Places