From: | "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers/files: switchlibGL ati-drivers-2.6.36.patch ati-drivers-2.6.38.patch ati-drivers-2.6.37.patch |
Date: | Mon, 31 Oct 2011 19:34:33 |
Message-Id: | 20111031193418.3F0BA2004B@flycatcher.gentoo.org |
1 | chithanh 11/10/31 19:34:18 |
2 | |
3 | Modified: switchlibGL |
4 | Removed: ati-drivers-2.6.36.patch ati-drivers-2.6.38.patch |
5 | ati-drivers-2.6.37.patch |
6 | Log: |
7 | Import Enrico Tagliavini's 11.10 ebuild from the x11 overlay, remove drivers older than 6 months. |
8 | |
9 | (Portage version: 2.2.0_alpha72/cvs/Linux x86_64) |
10 | |
11 | Revision Changes Path |
12 | 1.2 x11-drivers/ati-drivers/files/switchlibGL |
13 | |
14 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/files/switchlibGL?rev=1.2&view=markup |
15 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/files/switchlibGL?rev=1.2&content-type=text/plain |
16 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/files/switchlibGL?r1=1.1&r2=1.2 |
17 | |
18 | Index: switchlibGL |
19 | =================================================================== |
20 | RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/switchlibGL,v |
21 | retrieving revision 1.1 |
22 | retrieving revision 1.2 |
23 | diff -u -r1.1 -r1.2 |
24 | --- switchlibGL 2 Oct 2011 02:28:03 -0000 1.1 |
25 | +++ switchlibGL 31 Oct 2011 19:34:18 -0000 1.2 |
26 | @@ -30,28 +30,31 @@ |
27 | exit $E_ERR |
28 | fi |
29 | |
30 | - |
31 | +current=$(eselect opengl show) |
32 | # Switch to right mode |
33 | case "$1" in |
34 | - "amd" ) |
35 | - eselect opengl set ati |
36 | - ;; |
37 | - "intel" ) |
38 | - eselect opengl set xorg-x11 |
39 | - ;; |
40 | - "query" ) |
41 | - current=`eselect opengl show` |
42 | - case "$current" in |
43 | - "ati" ) |
44 | - echo "amd" |
45 | - ;; |
46 | - "xorg-x11" ) |
47 | - echo "intel" |
48 | - ;; |
49 | - esac |
50 | - ;; |
51 | - * ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;; |
52 | - # other than amd|intel|query parameter report an error |
53 | + "amd" ) |
54 | + if [ $current != ati ] ; then |
55 | + eselect opengl set ati || return 1 |
56 | + fi |
57 | + ;; |
58 | + "intel" ) |
59 | + if [ $current != xorg-x11 ] ; then |
60 | + eselect opengl set xorg-x11 || return 1 |
61 | + fi |
62 | + ;; |
63 | + "query" ) |
64 | + case "$current" in |
65 | + "ati" ) |
66 | + echo "amd" |
67 | + ;; |
68 | + "xorg-x11" ) |
69 | + echo "intel" |
70 | + ;; |
71 | + esac |
72 | + ;; |
73 | + * ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;; |
74 | + # other than amd|intel|query parameter report an error |
75 | esac |
76 | |
77 | # A zero return value from the script upon exit indicates success. |