Re: compiz: Changes to 'debian-unstable'
On Sun, 2007-08-19 at 23:05 +0000, Sean Finney wrote:
>
> diff --git a/debian/compiz.wrapper b/debian/compiz.wrapper
> index ae4bf40..258f85e 100644
> --- a/debian/compiz.wrapper
> +++ b/debian/compiz.wrapper
> @@ -4,6 +4,7 @@ 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
> @@ -33,6 +34,14 @@ if [ -f /usr/lib/compiz/libgconf.so ]; then
> COMPIZ_PLUGINS="$COMPIZ_PLUGINS gconf"
> fi
>
> -# always load the gconf plugin
> -/usr/bin/compiz.real $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS
> +# 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
Ugh. For starters, that Xgl runs doesn't mean we're on its display...
P.S. Where did the other commit mails go?
--
Earthling Michel Dänzer | http://tungstengraphics.com
Libre software enthusiast | Debian, X and DRI developer
Reply to: