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
1 jmbsvicetto 08/12/31 16:44:58
2
3 Modified: compiz-manager
4 Log:
5 Fixed the hardcoded /lib path in compiz-manager. Fixes bug #253246.
6 (Portage version: 2.2_rc19/cvs/Linux 2.6.28-gentoo x86_64)
7
8 Revision Changes Path
9 1.2 x11-wm/compiz/files/compiz-manager
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/files/compiz-manager?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/files/compiz-manager?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/files/compiz-manager?r1=1.1&r2=1.2
14
15 Index: compiz-manager
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-wm/compiz/files/compiz-manager,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- compiz-manager 1 Nov 2008 13:19:57 -0000 1.1
22 +++ compiz-manager 31 Dec 2008 16:44:58 -0000 1.2
23 @@ -1,6 +1,6 @@
24 #!/bin/sh
25 # Compiz Manager wrapper script
26 -#
27 +#
28 # Copyright (c) 2007 Kristian Lyngstøl <kristian@×××××××××.org>
29 #
30 # This program is free software; you can redistribute it and/or modify
31 @@ -24,15 +24,15 @@
32 # Much of this code is based on Beryl code, also licensed under the GPL.
33 # This script will detect what options we need to pass to compiz to get it
34 # started, and start a default plugin and possibly window decorator.
35 -#
36 +#
37
38
39 COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz
40 -PLUGIN_PATH="/usr/lib/compiz/"
41 +PLUGIN_PATH="/usr/lib/compiz/"
42 GLXINFO="/usr/bin/glxinfo"
43 KWIN="/usr/bin/kwin"
44 METACITY="/usr/bin/metacity"
45 -COMPIZ_NAME="compiz" # Final name for compiz (compiz.real)
46 +COMPIZ_NAME="compiz" # Final name for compiz (compiz.real)
47
48 # For Xgl LD_PRELOAD
49 LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
50 @@ -53,7 +53,7 @@
51 # Driver whitelist
52 WHITELIST="nvidia intel ati radeon i810"
53
54 -# blacklist based on the pci ids
55 +# blacklist based on the pci ids
56 # See http://wiki.compiz-fusion.org/Hardware/Blacklist for details
57 T=" 1002:5954 1002:5854 1002:5955" # ati rs480
58 T="$T 1002:4153" # ATI Rv350
59 @@ -122,10 +122,10 @@
60 {
61 verbose "Checking for FBConfig: "
62 if [ "$INDIRECT" = "yes" ]; then
63 - $GLXINFO -i | grep -q GLX.*fbconfig
64 + $GLXINFO -i | grep -q GLX.*fbconfig
65 FB=$?
66 else
67 - $GLXINFO | grep -q GLX.*fbconfig
68 + $GLXINFO | grep -q GLX.*fbconfig
69 FB=$?
70 fi
71
72 @@ -250,7 +250,7 @@
73 fi
74 for DRV in ${WHITELIST}; do
75 if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG &&
76 - ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG;
77 + ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG;
78 then
79 return 0
80 fi
81 @@ -341,7 +341,7 @@
82 if ! running_under_whitelisted_driver || have_blacklisted_pciid; then
83 abort_with_fallback_wm
84 fi
85 - # check if we have the required bits to run compiz and if not,
86 + # check if we have the required bits to run compiz and if not,
87 # fallback
88 if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then
89 abort_with_fallback_wm
90 @@ -381,4 +381,3 @@
91 fi
92
93 ${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS
94 -