Contents of /trunk/opengl-update-magellan/patches/opengl-update-2.2.1-magellanize.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 2569 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 2569 byte(s)
-import
1 | --- opengl-update-2.2.1 2005-05-30 20:29:12.000000000 +0000 |
2 | +++ opengl-update-2.2.1-hacked 2005-05-30 20:28:46.000000000 +0000 |
3 | @@ -7,7 +7,10 @@ |
4 | # Further modifications based off submissions to bug #54984 <cyfred@gentoo.org> |
5 | # Further modifications by Jeremy Huddleston <eradicator@gentoo.org> |
6 | |
7 | -. /etc/init.d/functions.sh |
8 | +#hacked for use with magellan-linux |
9 | +# <niro@magellan-linux.de> |
10 | + |
11 | +source /etc/init.d/functions |
12 | |
13 | hasq() { |
14 | local x |
15 | @@ -31,10 +34,11 @@ |
16 | } |
17 | |
18 | check_version() { |
19 | - if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then |
20 | - eerror "This version requires >=x11-base/xorg-x11-6.8.0-r4" |
21 | - exit 1 |
22 | - fi |
23 | + #if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then |
24 | + # eerror "This version requires >=x11-base/xorg-x11-6.8.0-r4" |
25 | + # exit 1 |
26 | + #fi |
27 | + return 0 |
28 | } |
29 | |
30 | get_current_implem() { |
31 | @@ -102,7 +106,7 @@ |
32 | $(echo ${AVAIL_IMPLEMS} | wc -w) available implementation${IMPLEM_PLURAL}: ${AVAIL_IMPLEMS} |
33 | |
34 | Examples: |
35 | - ${0##*/} xorg-x11 |
36 | + ${0##*/} xorg |
37 | This will setup things to use libGL.so from X.org. |
38 | |
39 | ${0##*/} nvidia |
40 | @@ -187,7 +191,7 @@ |
41 | exit 1 |
42 | fi |
43 | |
44 | - ebegin "Switching to ${GL_IMPLEM} OpenGL interface" |
45 | + echo "Switching to ${GL_IMPLEM} OpenGL interface" |
46 | rm -f ${ENV_D} &> /dev/null |
47 | |
48 | LIBDIRS="lib32 lib lib64" |
49 | @@ -200,9 +204,9 @@ |
50 | [[ -d "${PREFIX}/${LIBDIR}/opengl" && ! -h "${PREFIX}/${LIBDIR}" ]] || continue |
51 | fi |
52 | |
53 | - # Fallback on xorg-x11 if we don't have this implementation for this LIBDIR. |
54 | + # Fallback on xorg if we don't have this implementation for this LIBDIR. |
55 | if [[ ! -d ${PREFIX}/${LIBDIR}/opengl/"${GL_IMPLEM}" ]]; then |
56 | - GL_LOCAL="xorg-x11" |
57 | + GL_LOCAL="xorg" |
58 | else |
59 | GL_LOCAL="${GL_IMPLEM}" |
60 | fi |
61 | @@ -298,9 +302,9 @@ |
62 | elif [[ -e ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} ]]; then |
63 | [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file} |
64 | ln -s ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} |
65 | - elif [[ -e ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file} ]]; then |
66 | + elif [[ -e ${PREFIX}/${LIBDIR}/opengl/xorg/include/${file} ]]; then |
67 | [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file} |
68 | - ln -s ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file} |
69 | + ln -s ${PREFIX}/${LIBDIR}/opengl/xorg/include/${file} |
70 | fi |
71 | done |
72 | popd &> /dev/null |
73 | @@ -313,9 +317,9 @@ |
74 | echo "LDPATH=\"${ldpath}\"" > ${ENV_D} |
75 | echo "OPENGL_PROFILE=\"${GL_IMPLEM}\"" >> ${ENV_D} |
76 | |
77 | - env-update |
78 | + env-rebuild |
79 | |
80 | - eend 0 |
81 | + return 0 |
82 | } |
83 | |
84 | ## START PROGRAM ## |
Properties
Name | Value |
---|---|
svn:executable | * |