Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/compiz/files: compiz-manager
Date: Wed, 31 Dec 2008 16:45:01
Message-Id: E1LI4Bm-0003sm-NX@stork.gentoo.org
jmbsvicetto    08/12/31 16:44:58

  Modified:             compiz-manager
  Log:
  Fixed the hardcoded /lib path in compiz-manager. Fixes bug #253246.
  (Portage version: 2.2_rc19/cvs/Linux 2.6.28-gentoo x86_64)

Revision  Changes    Path
1.2                  x11-wm/compiz/files/compiz-manager

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/files/compiz-manager?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/files/compiz-manager?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/files/compiz-manager?r1=1.1&r2=1.2

Index: compiz-manager
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-wm/compiz/files/compiz-manager,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compiz-manager	1 Nov 2008 13:19:57 -0000	1.1
+++ compiz-manager	31 Dec 2008 16:44:58 -0000	1.2
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Compiz Manager wrapper script
-# 
+#
 # Copyright (c) 2007 Kristian Lyngstøl <kristian@×××××××××.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -24,15 +24,15 @@
 # Much of this code is based on Beryl code, also licensed under the GPL.
 # This script will detect what options we need to pass to compiz to get it
 # started, and start a default plugin and possibly window decorator.
-# 
+#
 
 
 COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz
-PLUGIN_PATH="/usr/lib/compiz/" 
+PLUGIN_PATH="/usr/lib/compiz/"
 GLXINFO="/usr/bin/glxinfo"
 KWIN="/usr/bin/kwin"
 METACITY="/usr/bin/metacity"
-COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) 
+COMPIZ_NAME="compiz" # Final name for compiz (compiz.real)
 
 # For Xgl LD_PRELOAD
 LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
@@ -53,7 +53,7 @@
 # Driver whitelist
 WHITELIST="nvidia intel ati radeon i810"
 
-# blacklist based on the pci ids 
+# blacklist based on the pci ids
 # See http://wiki.compiz-fusion.org/Hardware/Blacklist for details
 T="   1002:5954 1002:5854 1002:5955" # ati rs480
 T="$T 1002:4153" # ATI Rv350
@@ -122,10 +122,10 @@
 {
 	verbose "Checking for FBConfig: "
 	if [ "$INDIRECT" = "yes" ]; then
-		$GLXINFO -i | grep -q GLX.*fbconfig 
+		$GLXINFO -i | grep -q GLX.*fbconfig
 		FB=$?
 	else
-		$GLXINFO | grep -q GLX.*fbconfig 
+		$GLXINFO | grep -q GLX.*fbconfig
 		FB=$?
 	fi
 
@@ -250,7 +250,7 @@
 	fi
 	for DRV in ${WHITELIST}; do
 		if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG &&
-		   ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG; 
+		   ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG;
 		then
 			return 0
 		fi
@@ -341,7 +341,7 @@
 	if ! running_under_whitelisted_driver || have_blacklisted_pciid; then
 		abort_with_fallback_wm
 	fi
-	# check if we have the required bits to run compiz and if not, 
+	# check if we have the required bits to run compiz and if not,
 	# fallback
 	if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then
 		abort_with_fallback_wm
@@ -381,4 +381,3 @@
 fi
 
 ${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS
-