debian/changelog | 1 -
debian/compiz.wrapper | 13 ++-----------
2 files changed, 2 insertions(+), 12 deletions(-)
New commits:
commit 5d3c26e49c9dcbcabb930758ccf018b0082853bb
Author: Sean Finney <[EMAIL PROTECTED]>
Date: Wed Aug 22 22:53:03 2007 -0700
Revert "add xgl support to compiz wrapper"
This reverts commit 0af4cbe055b0423d3dff8218470280b3f71c426f.
it was decided on irc that this patch was sub-optimal and it
was better to get 0.5.2 out the door before anything else.
diff --git a/debian/changelog b/debian/changelog
index fa28543..02fb8cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,6 @@ compiz (0.5.2-0) UNRELEASED; urgency=low
* make sure configure is executable at build time. seems that this
causes problems in a pbuilder environment
* new build-dependencies on libxml-parser-perl and xsltproc
- * patch compiz wrapper for Xgl support (closes: #393501).
-- sean finney <[EMAIL PROTECTED]> Sat, 18 Aug 2007 21:59:47 -0700
diff --git a/debian/compiz.wrapper b/debian/compiz.wrapper
index 258f85e..ae4bf40 100644
--- a/debian/compiz.wrapper
+++ b/debian/compiz.wrapper
@@ -4,7 +4,6 @@ GLXINFO='/usr/bin/glxinfo'
EXT_TFP='GLX_EXT_texture_from_pixmap'
COMPIZ_OPTIONS="--no-fbo"
-COMPIZ_LD_PRELOAD=""
# Check whether the GLX_EXT_texture_from_pixmap extension is available in
# direct or indirect rendering contexts. If it is available only in indirect
@@ -34,14 +33,6 @@ if [ -f /usr/lib/compiz/libgconf.so ]; then
COMPIZ_PLUGINS="$COMPIZ_PLUGINS gconf"
fi
-# use mesa library if Xgl is running
-if ps -C Xgl > /dev/null; then
- if [ -f /usr/lib/nvidia/libGL.so.1.2.xlibmesa ]; then
- COMPIZ_LD_PRELOAD="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
- elif [ -f /usr/lib/fglrx/libGL.so.1.2.xlibmesa ]; then
- COMPIZ_LD_PRELOAD="/usr/lib/fglrx/libGL.so.1.2.xlibmesa"
- fi
-fi
-
# always load the gconf plugin
-LD_PRELOAD=$COMPIZ_LD_PRELOAD /usr/bin/compiz.real $COMPIZ_OPTIONS "$@"
$COMPIZ_PLUGINS
+/usr/bin/compiz.real $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS
+
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
