1 |
commit: 071b242eaa79c4273e4c541103d5d13e7fb8f72d |
2 |
Author: Krzysztof Pawlik <none <AT> none> |
3 |
AuthorDate: Tue Jul 5 18:19:53 2011 +0000 |
4 |
Commit: Krzysztof Pawlik <nelchael <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 5 18:19:53 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/nelchael.git;a=commit;h=071b242e |
7 |
|
8 |
Remove unneeded files. |
9 |
|
10 |
--- |
11 |
x11-drivers/nvidia-drivers/Manifest | 18 - |
12 |
x11-drivers/nvidia-drivers/files/09nvidia | 2 - |
13 |
.../nvidia-drivers/files/195.30-unified-arch.patch | 30 -- |
14 |
.../nvidia-drivers/files/256.35-unified-arch.patch | 30 -- |
15 |
.../NVIDIA-Linux-x86-256.53-linux-2.6.36.patch | 14 - |
16 |
.../nvidia-drivers/files/NVIDIA_glx-defines.patch | 11 - |
17 |
.../nvidia-drivers/files/NVIDIA_glx-glheader.patch | 13 - |
18 |
.../nvidia-drivers/files/eblits/donvidia.eblit | 21 - |
19 |
.../nvidia-drivers/files/eblits/mtrr_check.eblit | 19 - |
20 |
.../files/eblits/src_install-libs.eblit | 116 ----- |
21 |
.../nvidia-drivers/files/eblits/want_tls.eblit | 33 -- |
22 |
x11-drivers/nvidia-drivers/files/libGL.la-r2 | 32 -- |
23 |
x11-drivers/nvidia-drivers/files/nvidia | 40 -- |
24 |
x11-drivers/nvidia-drivers/files/nvidia-169.07 | 14 - |
25 |
.../files/nvidia-drivers-190.53-2.6.33.patch | 92 ---- |
26 |
.../nvidia-drivers/nvidia-drivers-256.53-r1.ebuild | 520 -------------------- |
27 |
16 files changed, 0 insertions(+), 1005 deletions(-) |
28 |
|
29 |
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest |
30 |
deleted file mode 100644 |
31 |
index 9ed210a..0000000 |
32 |
--- a/x11-drivers/nvidia-drivers/Manifest |
33 |
+++ /dev/null |
34 |
@@ -1,18 +0,0 @@ |
35 |
-AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39 |
36 |
-AUX 195.30-unified-arch.patch 1525 RMD160 9872c270b4bb3d3010af3f2b83798631562c8d8f SHA1 06330376e9a25e3317a4bfe12f74af17e56f3448 SHA256 b6224e213820c698315a8645204d992b779f31e8c45c025e740bc189dc1f9bae |
37 |
-AUX 256.35-unified-arch.patch 1498 RMD160 63285585705b880f4e745e1f6ffad493ea876d05 SHA1 a2537442b2d896cd8b6e8897b345fee3bfcf5222 SHA256 7861431595e425c5df8acffb8bf536befa7a13618d6f66456aef6dac4db5c314 |
38 |
-AUX NVIDIA-Linux-x86-256.53-linux-2.6.36.patch 498 RMD160 0bb4b53f82d1b97aa157867fd28a1932f3385be5 SHA1 f3305db149f74190e4f3e9810cb340503dbe6337 SHA256 c57a4d2249c622a17bfca7249c599906d6d67ff521608d835f94429138e1b9c4 |
39 |
-AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da |
40 |
-AUX NVIDIA_glx-glheader.patch 380 RMD160 ee9a10cfbed10d5711f58a80553ffebeea5853bf SHA1 72abfedb9dfb7dae7dc23a5701d3e00282fef2c0 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf |
41 |
-AUX eblits/donvidia.eblit 695 RMD160 e83869944dfce52a62423412e6c22b4e4468bc3c SHA1 0c877bbe4402c2845f8f4353c9f2d8086d364fbc SHA256 d404dd7e5657d83ccf3687720fb978030a3716e47957fb8bb80dea3ed57b3672 |
42 |
-AUX eblits/mtrr_check.eblit 629 RMD160 a7f9090f419faa17e74b81346c4bb019a7700138 SHA1 edb9ba38de929a9a0406408701a454f514fe78ed SHA256 ae1b8fb37985fc3e42a4a776779b3fe3d70be2c826df5c3f99d03ba7209ca0b1 |
43 |
-AUX eblits/src_install-libs.eblit 3472 RMD160 3e00b70ea45c7fdf6ec6a48c121f56b8faae15da SHA1 ec4cb37556284846a24fcdd54cff1a4cd0ccc539 SHA256 6f301de374736cec316794bf1935a15de025b3c505981f24e06e3df75818ad6a |
44 |
-AUX eblits/want_tls.eblit 952 RMD160 4f33e6aef50032665d68654af1cfdbd9abc54195 SHA1 cf96ae8227913439526f0ab2ec984e5be6f3a1fd SHA256 e5ce767a2e9a5c0682e764b9ba42a20e721a093f4c0626605570c8b5e3afecd0 |
45 |
-AUX libGL.la-r2 733 RMD160 479612ab30c04ca0683c7d9edaf9ab3de783e4a9 SHA1 88656b7e7234ade4f5564373fd6eb5c040167655 SHA256 4856e7a2c31763ade41c93a395f3e80a2705ac2ab4dbd73e5161cdba132f407b |
46 |
-AUX nvidia 1510 RMD160 ca0d0e5375109d9edf682d9bdda743b7c693e4d4 SHA1 85cf9bff167dcc063ba61426523973e9598085f7 SHA256 b193cc3f6d6f39138720a2282d9f161fc8f2e8a15bc43d183a30eb879add06c5 |
47 |
-AUX nvidia-169.07 639 RMD160 8baddb6fd1bf7f0e2688870a78e8ace051d62e3f SHA1 b30487ba2a24a6b1359d1fd831eeb1705060953c SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577 |
48 |
-AUX nvidia-drivers-190.53-2.6.33.patch 2893 RMD160 29f6cf29909828f8d22504dfcb43b23aeeff78dd SHA1 412f8a2b208e8af886891985fcabf8623c9943c3 SHA256 68f5cdf4489fb6bc480319e4bda6e6481beb189cf37920b939b8f7bbf77aed1f |
49 |
-DIST NVIDIA-FreeBSD-x86-256.53.tar.gz 26347367 RMD160 c87f54dc7d9c005ab697cf0356f62254d1b0afa0 SHA1 3ba0457a5541f1f9dd73a876138619c22839f1f0 SHA256 3c3d3a96f6ec79b86815423c4be38c819b2ff26124a8885421e34f60a3c70655 |
50 |
-DIST NVIDIA-Linux-x86-256.53.run 25388956 RMD160 a538178866181aa252e8b4b7a62c0980c215a5bd SHA1 ecebed7c07368f6e0fe09aead042e234db0ac559 SHA256 2f05b6ccf4717a79f8f326096fe4e910a0173c789f1f96be7f5dafff0f5fa4be |
51 |
-DIST NVIDIA-Linux-x86_64-256.53.run 42905128 RMD160 7a8229d42cd2ec2012c0f5badcd7f88b6e593492 SHA1 8854e6923b9ceca42310e367bbcf5eed2e98545e SHA256 febee3eb128e1d62565fccb3ad1577f741c4bf067072e45e7766ab999aa590c9 |
52 |
-EBUILD nvidia-drivers-256.53-r1.ebuild 15789 RMD160 9471c713be40f64df9806c73b8129beb32792d20 SHA1 6f32bc9a0c0f1405561efa0193dcb1f88d95b4e7 SHA256 3cf00cae98f6abdd60b3f0cbcf67f50039a9c519c0e701271ad695bd40aa66e4 |
53 |
|
54 |
diff --git a/x11-drivers/nvidia-drivers/files/09nvidia b/x11-drivers/nvidia-drivers/files/09nvidia |
55 |
deleted file mode 100644 |
56 |
index 1fcbef4..0000000 |
57 |
--- a/x11-drivers/nvidia-drivers/files/09nvidia |
58 |
+++ /dev/null |
59 |
@@ -1,2 +0,0 @@ |
60 |
-# Has to precede X11's own libraries! |
61 |
-LDPATH=/opt/nvidia/lib |
62 |
|
63 |
diff --git a/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch b/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch |
64 |
deleted file mode 100644 |
65 |
index eff06a5..0000000 |
66 |
--- a/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch |
67 |
+++ /dev/null |
68 |
@@ -1,30 +0,0 @@ |
69 |
-diff -Naurp NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh |
70 |
---- NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh 2010-02-07 22:53:38.000000000 +0100 |
71 |
-+++ NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh 2010-02-07 22:57:10.000000000 +0100 |
72 |
-@@ -82,7 +82,7 @@ build_cflags() { |
73 |
- |
74 |
- if [ "$OUTPUT" != "$SOURCES" ]; then |
75 |
- MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" |
76 |
-- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then |
77 |
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then |
78 |
- MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" |
79 |
- MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" |
80 |
- fi |
81 |
-@@ -91,7 +91,7 @@ build_cflags() { |
82 |
- fi |
83 |
- else |
84 |
- MACH_CFLAGS="-I$HEADERS/asm/mach-default" |
85 |
-- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then |
86 |
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then |
87 |
- MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" |
88 |
- MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" |
89 |
- fi |
90 |
-@@ -102,7 +102,7 @@ build_cflags() { |
91 |
- |
92 |
- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS" |
93 |
- |
94 |
-- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then |
95 |
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then |
96 |
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" |
97 |
- fi |
98 |
- if [ -n "$BUILD_PARAMS" ]; then |
99 |
|
100 |
diff --git a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch |
101 |
deleted file mode 100644 |
102 |
index da92b8f..0000000 |
103 |
--- a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch |
104 |
+++ /dev/null |
105 |
@@ -1,30 +0,0 @@ |
106 |
-diff -NuarpbB NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh NVIDIA-Linux-x86-256.25/kernel/conftest.sh |
107 |
---- NVIDIA-Linux-x86-256.25-ori/kernel/conftest.sh 2010-05-19 05:38:57.000000000 +0200 |
108 |
-+++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh 2010-05-22 02:13:56.000000000 +0200 |
109 |
-@@ -101,7 +101,7 @@ build_cflags() { |
110 |
- |
111 |
- if [ "$OUTPUT" != "$SOURCES" ]; then |
112 |
- MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" |
113 |
-- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then |
114 |
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then |
115 |
- MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" |
116 |
- MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" |
117 |
- fi |
118 |
-@@ -110,7 +110,7 @@ build_cflags() { |
119 |
- fi |
120 |
- else |
121 |
- MACH_CFLAGS="-I$HEADERS/asm/mach-default" |
122 |
-- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then |
123 |
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then |
124 |
- MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" |
125 |
- MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" |
126 |
- fi |
127 |
-@@ -121,7 +121,7 @@ build_cflags() { |
128 |
- |
129 |
- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" |
130 |
- |
131 |
-- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then |
132 |
-+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then |
133 |
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" |
134 |
- fi |
135 |
- if [ -n "$BUILD_PARAMS" ]; then |
136 |
|
137 |
diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA-Linux-x86-256.53-linux-2.6.36.patch b/x11-drivers/nvidia-drivers/files/NVIDIA-Linux-x86-256.53-linux-2.6.36.patch |
138 |
deleted file mode 100644 |
139 |
index aba7c25..0000000 |
140 |
--- a/x11-drivers/nvidia-drivers/files/NVIDIA-Linux-x86-256.53-linux-2.6.36.patch |
141 |
+++ /dev/null |
142 |
@@ -1,14 +0,0 @@ |
143 |
---- kernel/nv.c.orig 2010-09-06 14:45:15.854189159 +0200 |
144 |
-+++ kernel/nv.c 2010-09-06 14:45:35.972189393 +0200 |
145 |
-@@ -423,9 +423,10 @@ |
146 |
- static struct file_operations nv_fops = { |
147 |
- .owner = THIS_MODULE, |
148 |
- .poll = nv_kern_poll, |
149 |
-- .ioctl = nv_kern_ioctl, |
150 |
- #if defined(HAVE_UNLOCKED_IOCTL) |
151 |
- .unlocked_ioctl = nv_kern_unlocked_ioctl, |
152 |
-+#else |
153 |
-+ .ioctl = nv_kern_ioctl, |
154 |
- #endif |
155 |
- #if defined(NVCPU_X86_64) && defined(HAVE_COMPAT_IOCTL) |
156 |
- .compat_ioctl = nv_kern_compat_ioctl, |
157 |
|
158 |
diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch |
159 |
deleted file mode 100644 |
160 |
index da9933f..0000000 |
161 |
--- a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch |
162 |
+++ /dev/null |
163 |
@@ -1,11 +0,0 @@ |
164 |
-diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h |
165 |
---- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h 2002-12-09 21:26:55.000000000 +0100 |
166 |
-+++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h 2003-01-30 18:20:23.000000000 +0100 |
167 |
-@@ -39,6 +39,7 @@ |
168 |
- typedef XID GLXPixmap; |
169 |
- typedef XID GLXDrawable; |
170 |
- typedef XID GLXPbuffer; |
171 |
-+typedef XID GLXPbufferSGIX; |
172 |
- typedef XID GLXWindow; |
173 |
- typedef XID GLXFBConfigID; |
174 |
- |
175 |
|
176 |
diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch |
177 |
deleted file mode 100644 |
178 |
index e0393e1..0000000 |
179 |
--- a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch |
180 |
+++ /dev/null |
181 |
@@ -1,13 +0,0 @@ |
182 |
---- usr/include/GL/gl.g.orig 2004-07-17 19:56:59.789410584 +1000 |
183 |
-+++ usr/include/GL/gl.h 2004-07-17 19:59:08.844791184 +1000 |
184 |
-@@ -66,6 +66,10 @@ |
185 |
- typedef double GLclampd; |
186 |
- typedef void GLvoid; |
187 |
- |
188 |
-+/* Patching for some better defines in the global system */ |
189 |
-+#ifndef GL_GLEXT_LEGACY |
190 |
-+#include <GL/glext.h> |
191 |
-+#endif |
192 |
- |
193 |
- /*************************************************************/ |
194 |
- |
195 |
|
196 |
diff --git a/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit b/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit |
197 |
deleted file mode 100644 |
198 |
index 75b39cf..0000000 |
199 |
--- a/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit |
200 |
+++ /dev/null |
201 |
@@ -1,21 +0,0 @@ |
202 |
-# Copyright 1999-2008 Gentoo Foundation |
203 |
-# Distributed under the terms of the GNU General Public License v2 |
204 |
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/donvidia.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ |
205 |
- |
206 |
-# Install nvidia library: |
207 |
-# the first parameter is the place where to install it |
208 |
-# the second parameter is the base name of the library |
209 |
-# the third parameter is the provided soversion |
210 |
-donvidia() { |
211 |
- dodir $1 |
212 |
- exeinto $1 |
213 |
- |
214 |
- libname=$(basename $2) |
215 |
- |
216 |
- # libnvidia-cfg.so is no longer supplied in lib32; step over it gracefully |
217 |
- if [ -e $2.$3 ] ; then |
218 |
- doexe $2.$3 |
219 |
- dosym ${libname}.$3 $1/${libname} |
220 |
- [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 |
221 |
- fi |
222 |
-} |
223 |
|
224 |
diff --git a/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit b/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit |
225 |
deleted file mode 100644 |
226 |
index b14df34..0000000 |
227 |
--- a/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit |
228 |
+++ /dev/null |
229 |
@@ -1,19 +0,0 @@ |
230 |
-# Copyright 1999-2008 Gentoo Foundation |
231 |
-# Distributed under the terms of the GNU General Public License v2 |
232 |
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/mtrr_check.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ |
233 |
- |
234 |
-mtrr_check() { |
235 |
- ebegin "Checking for MTRR support" |
236 |
- linux_chkconfig_present MTRR |
237 |
- eend $? |
238 |
- |
239 |
- if [[ $? -ne 0 ]] ; then |
240 |
- eerror "Please enable MTRR support in your kernel config, found at:" |
241 |
- eerror |
242 |
- eerror " Processor type and features" |
243 |
- eerror " [*] MTRR (Memory Type Range Register) support" |
244 |
- eerror |
245 |
- eerror "and recompile your kernel ..." |
246 |
- die "MTRR support not detected!" |
247 |
- fi |
248 |
-} |
249 |
|
250 |
diff --git a/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit b/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit |
251 |
deleted file mode 100644 |
252 |
index e48d11c..0000000 |
253 |
--- a/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit |
254 |
+++ /dev/null |
255 |
@@ -1,116 +0,0 @@ |
256 |
-# Copyright 1999-2008 Gentoo Foundation |
257 |
-# Distribnuted under the terms of the GNU General Public License v2 |
258 |
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/src_install-libs.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ |
259 |
-# |
260 |
-src_install-libs() { |
261 |
- local pkglibdir=lib |
262 |
- local inslibdir=$(get_libdir) |
263 |
- |
264 |
- if [[ ${#} -eq 2 ]] ; then |
265 |
- pkglibdir=${1} |
266 |
- inslibdir=${2} |
267 |
- elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then |
268 |
- pkglibdir=lib32 |
269 |
- fi |
270 |
- |
271 |
- local usrpkglibdir=usr/${pkglibdir} |
272 |
- local libdir=usr/X11R6/${pkglibdir} |
273 |
- local drvdir=${libdir}/modules/drivers |
274 |
- local extdir=${libdir}/modules/extensions |
275 |
- local incdir=usr/include/GL |
276 |
- local sover=${PV} |
277 |
- local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" |
278 |
- local NO_TLS_ROOT="${NV_ROOT}/no-tls" |
279 |
- local TLS_ROOT="${NV_ROOT}/tls" |
280 |
- local X11_LIB_DIR="/usr/${inslibdir}/xorg" |
281 |
- |
282 |
- if use x86-fbsd; then |
283 |
- # on FreeBSD everything is on obj/ |
284 |
- pkglibdir=obj |
285 |
- usrpkglibdir=obj |
286 |
- x11pkglibdir=obj |
287 |
- drvdir=obj |
288 |
- extdir=obj |
289 |
- |
290 |
- # don't ask me why the headers are there.. glxext.h is missing |
291 |
- incdir=doc |
292 |
- |
293 |
- # on FreeBSD it has just .1 suffix |
294 |
- sover=1 |
295 |
- fi |
296 |
- |
297 |
- # The GLX libraries |
298 |
- donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover} |
299 |
- donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover} |
300 |
- |
301 |
- donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover} |
302 |
- |
303 |
- dodir ${NO_TLS_ROOT} |
304 |
- donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover} |
305 |
- |
306 |
- if ! use x86-fbsd; then |
307 |
- donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover} |
308 |
- fi |
309 |
- |
310 |
- if want_tls ; then |
311 |
- dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib |
312 |
- dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib |
313 |
- dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib |
314 |
- else |
315 |
- dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib |
316 |
- dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib |
317 |
- dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib |
318 |
- fi |
319 |
- |
320 |
- if ! use x86-fbsd; then |
321 |
- # Install the .la file for libtool, to prevent e.g. bug #176423 |
322 |
- [ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR" |
323 |
- local ver1=$(get_version_component_range 1) |
324 |
- local ver2=$(get_version_component_range 2) |
325 |
- local ver3=$(get_version_component_range 3) |
326 |
- sed -e "s:\${PV}:${PV}:" \ |
327 |
- -e "s:\${ver1}:${ver1}:" \ |
328 |
- -e "s:\${ver2}:${ver2}:" \ |
329 |
- -e "s:\${ver3}:${ver3}:" \ |
330 |
- -e "s:\${libdir}:${inslibdir}:" \ |
331 |
- "${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la |
332 |
- fi |
333 |
- |
334 |
- exeinto ${X11_LIB_DIR}/modules/drivers |
335 |
- |
336 |
- [[ -f ${drvdir}/nvidia_drv.so ]] && \ |
337 |
- doexe ${drvdir}/nvidia_drv.so |
338 |
- |
339 |
- insinto /usr/${inslibdir} |
340 |
- [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ |
341 |
- doins ${libdir}/libXvMCNVIDIA.a |
342 |
- exeinto /usr/${inslibdir} |
343 |
- # fix Bug 131315 |
344 |
- [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \ |
345 |
- doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \ |
346 |
- dosym libXvMCNVIDIA.so.${PV} \ |
347 |
- /usr/${inslibdir}/libXvMCNVIDIA.so |
348 |
- |
349 |
- exeinto ${NV_ROOT}/extensions |
350 |
- [[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \ |
351 |
- newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so |
352 |
- [[ -f ${extdir}/libglx.so.${sover} ]] && \ |
353 |
- newexe ${extdir}/libglx.so.${sover} libglx.so |
354 |
- |
355 |
- # Includes |
356 |
- insinto ${NV_ROOT}/include |
357 |
- doins ${incdir}/*.h |
358 |
- |
359 |
- #cuda |
360 |
- if [[ -f usr/include/cuda/cuda.h ]]; then |
361 |
- dodir /usr/include/cuda |
362 |
- insinto /usr/include/cuda |
363 |
- doins usr/include/cuda/*.h |
364 |
- |
365 |
- if [[ -f usr/${pkglibdir}/libcuda.so.${PV} ]]; then |
366 |
- dolib.so usr/${pkglibdir}/libcuda.so.${PV} |
367 |
- dosym libcuda.so.${PV} /usr/${inslibdir}/libcuda.so.1 |
368 |
- dosym libcuda.so.1 /usr/${inslibdir}/libcuda.so |
369 |
- fi |
370 |
- fi |
371 |
-} |
372 |
|
373 |
diff --git a/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit b/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit |
374 |
deleted file mode 100644 |
375 |
index 4debb85..0000000 |
376 |
--- a/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit |
377 |
+++ /dev/null |
378 |
@@ -1,33 +0,0 @@ |
379 |
-# Copyright 1999-2008 Gentoo Foundation |
380 |
-# Distributed under the terms of the GNU General Public License v2 |
381 |
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/eblits/want_tls.eblit,v 1.1 2008/12/18 18:27:35 cardoe Exp $ |
382 |
- |
383 |
-want_tls() { |
384 |
- # For uclibc or anything non glibc, return false |
385 |
- has_version sys-libs/glibc || return 1 |
386 |
- |
387 |
- # Old versions of glibc were lt/no-tls only |
388 |
- has_version '<sys-libs/glibc-2.3.2' && return 1 |
389 |
- |
390 |
- if use x86 ; then |
391 |
- case ${CHOST/-*} in |
392 |
- i486|i586|i686) ;; |
393 |
- *) return 1 ;; |
394 |
- esac |
395 |
- fi |
396 |
- |
397 |
- # If we've got nptl, we've got tls |
398 |
- built_with_use --missing true sys-libs/glibc nptl && return 0 |
399 |
- |
400 |
- # 2.3.5 turned off tls for linuxthreads glibc on i486 and i586 |
401 |
- if use x86 && has_version '>=sys-libs/glibc-2.3.5' ; then |
402 |
- case ${CHOST/-*} in |
403 |
- i486|i586) return 1 ;; |
404 |
- esac |
405 |
- fi |
406 |
- |
407 |
- # These versions built linuxthreads version to support tls, too |
408 |
- has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0 |
409 |
- |
410 |
- return 1 |
411 |
-} |
412 |
|
413 |
diff --git a/x11-drivers/nvidia-drivers/files/libGL.la-r2 b/x11-drivers/nvidia-drivers/files/libGL.la-r2 |
414 |
deleted file mode 100644 |
415 |
index 863d184..0000000 |
416 |
--- a/x11-drivers/nvidia-drivers/files/libGL.la-r2 |
417 |
+++ /dev/null |
418 |
@@ -1,32 +0,0 @@ |
419 |
-# libGL.la - a libtool library file |
420 |
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) |
421 |
-# |
422 |
-# Please DO NOT delete this file! |
423 |
-# It is necessary for linking the library. |
424 |
- |
425 |
-# The name that we can dlopen(3). |
426 |
-dlname='libGL.so.1' |
427 |
- |
428 |
-# Names of this library. |
429 |
-library_names='libGL.so.${PV} libGL.so.1 libGL.so' |
430 |
- |
431 |
-# The name of the static archive. |
432 |
-old_library='' |
433 |
- |
434 |
-# Libraries that this one depends upon. |
435 |
-dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl' |
436 |
- |
437 |
-# Version information for libGL. |
438 |
-current=${ver1} |
439 |
-age=${ver2} |
440 |
-revision=${ver3} |
441 |
- |
442 |
-# Is this an already installed library? |
443 |
-installed=yes |
444 |
- |
445 |
-# Files to dlopen/dlpreopen |
446 |
-dlopen='' |
447 |
-dlpreopen='' |
448 |
- |
449 |
-# Directory that this library needs to be installed in: |
450 |
-libdir='/usr/${libdir}' |
451 |
|
452 |
diff --git a/x11-drivers/nvidia-drivers/files/nvidia b/x11-drivers/nvidia-drivers/files/nvidia |
453 |
deleted file mode 100644 |
454 |
index 7cf0f7c..0000000 |
455 |
--- a/x11-drivers/nvidia-drivers/files/nvidia |
456 |
+++ /dev/null |
457 |
@@ -1,40 +0,0 @@ |
458 |
-# Nvidia drivers support |
459 |
-alias char-major-195 nvidia |
460 |
-alias /dev/nvidiactl char-major-195 |
461 |
- |
462 |
-# To tweak the driver the following options can be used, note that |
463 |
-# you should be careful, as it could cause instability!! For more |
464 |
-# options see /usr/share/doc/PACKAGE/README |
465 |
-# |
466 |
-# To enable Side Band Adressing: NVreg_EnableAGPSBA=1 |
467 |
-# |
468 |
-# To enable Fast Writes: NVreg_EnableAGPFW=1 |
469 |
-# |
470 |
-# To enable both for instance, uncomment following line: |
471 |
-# |
472 |
-#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1 |
473 |
-# If you have a mobile chip, you may need to enable this option |
474 |
-# if you have hard lockups when starting X. |
475 |
-# |
476 |
-# See: Appendix I. Configuring your laptop |
477 |
-# In /usr/share/doc/PACKAGE/README for full details |
478 |
-# |
479 |
-# Choose the appropriate value for NVreg_Mobile from the table: |
480 |
-# Value Meaning |
481 |
-# ---------- -------------------------------------------------- |
482 |
-# 0xFFFFFFFF let the kernel module autodetect the correct value |
483 |
-# 1 Dell laptops |
484 |
-# 2 non-Compal Toshiba laptops |
485 |
-# 3 all other laptops |
486 |
-# 4 Compal Toshiba laptops |
487 |
-# 5 Gateway laptops |
488 |
-# |
489 |
-#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3 |
490 |
- |
491 |
- |
492 |
-# !!! SECURITY WARNING !!! |
493 |
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW |
494 |
-# WHAT YOU ARE DOING. |
495 |
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, |
496 |
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. |
497 |
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 |
498 |
|
499 |
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07 |
500 |
deleted file mode 100644 |
501 |
index a96b0cd..0000000 |
502 |
--- a/x11-drivers/nvidia-drivers/files/nvidia-169.07 |
503 |
+++ /dev/null |
504 |
@@ -1,14 +0,0 @@ |
505 |
-# Nvidia drivers support |
506 |
-alias char-major-195 nvidia |
507 |
-alias /dev/nvidiactl char-major-195 |
508 |
- |
509 |
-# To tweak the driver the following options can be used, note that |
510 |
-# you should be careful, as it could cause instability!! For more |
511 |
-# options see /usr/share/doc/PACKAGE/README |
512 |
-# |
513 |
-# !!! SECURITY WARNING !!! |
514 |
-# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW |
515 |
-# WHAT YOU ARE DOING. |
516 |
-# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, |
517 |
-# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. |
518 |
-options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 |
519 |
|
520 |
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch |
521 |
deleted file mode 100644 |
522 |
index 75daad3..0000000 |
523 |
--- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch |
524 |
+++ /dev/null |
525 |
@@ -1,92 +0,0 @@ |
526 |
-Index: usr/src/nv/conftest.sh |
527 |
-=================================================================== |
528 |
---- usr/src/nv/conftest.sh |
529 |
-+++ usr/src/nv/conftest.sh 2010-01-06 12:10:56.000000000 +0530 |
530 |
-@@ -32,14 +32,14 @@ |
531 |
- # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats |
532 |
- # the kernel as a stand-alone kernel. |
533 |
- # |
534 |
-- FILE="linux/autoconf.h" |
535 |
-+ FILE="generated/autoconf.h" |
536 |
- |
537 |
- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then |
538 |
- # |
539 |
- # We are looking at a configured source tree; verify |
540 |
- # that it's not a Xen kernel. |
541 |
- # |
542 |
-- echo "#include <linux/autoconf.h> |
543 |
-+ echo "#include <generated/autoconf.h> |
544 |
- #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT) |
545 |
- #error CONFIG_XEN defined! |
546 |
- #endif |
547 |
-@@ -111,7 +111,12 @@ |
548 |
- fi |
549 |
- } |
550 |
- |
551 |
--CONFTEST_PREAMBLE="#include <linux/autoconf.h> |
552 |
-+CONFTEST_PREAMBLE="#include <linux/version.h> |
553 |
-+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) |
554 |
-+ #include <generated/autoconf.h> |
555 |
-+ #else |
556 |
-+ #include <linux/autoconf.h> |
557 |
-+ #endif |
558 |
- #if defined(CONFIG_XEN) && \ |
559 |
- defined(CONFIG_XEN_INTERFACE_VERSION) && !defined(__XEN_INTERFACE_VERSION__) |
560 |
- #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION |
561 |
-@@ -1294,7 +1299,7 @@ |
562 |
- echo ""; |
563 |
- fi |
564 |
- fi |
565 |
-- exit $RET |
566 |
-+# exit $RET |
567 |
- ;; |
568 |
- |
569 |
- get_uname) |
570 |
-@@ -1316,11 +1321,11 @@ |
571 |
- # tree or at headers shipped for a specific kernel. |
572 |
- # Determine the kernel version using a compile check. |
573 |
- # |
574 |
-- FILE="linux/utsrelease.h" |
575 |
-+ FILE="generated/utsrelease.h" |
576 |
- |
577 |
- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then |
578 |
- echo "$CONFTEST_PREAMBLE |
579 |
-- #include <linux/utsrelease.h> |
580 |
-+ #include <generated/utsrelease.h> |
581 |
- int main() { |
582 |
- printf(\"%s\", UTS_RELEASE); |
583 |
- return 0; |
584 |
-@@ -1375,7 +1380,7 @@ |
585 |
- # |
586 |
- RET=1 |
587 |
- VERBOSE=$6 |
588 |
-- FILE="linux/autoconf.h" |
589 |
-+ FILE="generated/autoconf.h" |
590 |
- |
591 |
- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then |
592 |
- # |
593 |
-@@ -1429,7 +1434,7 @@ |
594 |
- # |
595 |
- RET=1 |
596 |
- VERBOSE=$6 |
597 |
-- FILE="linux/autoconf.h" |
598 |
-+ FILE="generated/autoconf.h" |
599 |
- |
600 |
- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then |
601 |
- # |
602 |
-Index: usr/src/nv/nvacpi.c |
603 |
-=================================================================== |
604 |
---- usr/src/nv/nvacpi.c |
605 |
-+++ usr/src/nv/nvacpi.c 2010-01-06 12:10:56.000000000 +0530 |
606 |
-@@ -49,6 +49,10 @@ |
607 |
- }; |
608 |
- #endif |
609 |
- |
610 |
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) |
611 |
-+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL) |
612 |
-+#endif |
613 |
-+ |
614 |
- static struct acpi_driver *nv_acpi_driver; |
615 |
- static acpi_handle nvif_handle = NULL; |
616 |
- static acpi_handle dsm_handle = NULL; |
617 |
- |
618 |
|
619 |
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-256.53-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-256.53-r1.ebuild |
620 |
deleted file mode 100644 |
621 |
index c96117f..0000000 |
622 |
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-256.53-r1.ebuild |
623 |
+++ /dev/null |
624 |
@@ -1,520 +0,0 @@ |
625 |
-# Copyright 1999-2010 Gentoo Foundation |
626 |
-# Distributed under the terms of the GNU General Public License v2 |
627 |
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-256.53.ebuild,v 1.1 2010/08/31 15:57:49 cardoe Exp $ |
628 |
- |
629 |
-EAPI="2" |
630 |
- |
631 |
-inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver |
632 |
- |
633 |
-X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" |
634 |
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" |
635 |
-X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}" |
636 |
- |
637 |
-DESCRIPTION="NVIDIA X11 driver and GLX libraries" |
638 |
-HOMEPAGE="http://www.nvidia.com/" |
639 |
-SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${PV}/${X86_NV_PACKAGE}.run ) |
640 |
- amd64? ( ftp://download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run ) |
641 |
- x86-fbsd? ( ftp://download.nvidia.com/XFree86/FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )" |
642 |
- |
643 |
-LICENSE="NVIDIA" |
644 |
-SLOT="0" |
645 |
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" |
646 |
-IUSE="acpi custom-cflags gtk multilib kernel_linux" |
647 |
-RESTRICT="strip" |
648 |
-EMULTILIB_PKG="true" |
649 |
- |
650 |
-COMMON="<x11-base/xorg-server-1.9.99 |
651 |
- kernel_linux? ( >=sys-libs/glibc-2.6.1 ) |
652 |
- multilib? ( app-emulation/emul-linux-x86-xlibs ) |
653 |
- >=app-admin/eselect-opengl-1.0.9 |
654 |
- !<media-video/nvidia-settings-256.52" |
655 |
-DEPEND="${COMMON} |
656 |
- kernel_linux? ( virtual/linux-sources )" |
657 |
-RDEPEND="${COMMON} |
658 |
- x11-libs/libXvMC |
659 |
- kernel_linux? ( virtual/modutils ) |
660 |
- acpi? ( sys-power/acpid )" |
661 |
-PDEPEND=">=x11-libs/libvdpau-0.3-r1 |
662 |
- gtk? ( media-video/nvidia-settings )" |
663 |
- |
664 |
-QA_TEXTRELS_x86="usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV} |
665 |
- usr/lib/opengl/nvidia/lib/libGL.so.${PV} |
666 |
- usr/lib/libnvidia-glcore.so.${PV} |
667 |
- usr/lib/opengl/nvidia/extensions/libglx.so.${PV} |
668 |
- usr/lib/xorg/modules/drivers/nvidia_drv.so |
669 |
- usr/lib/libcuda.so.${PV} |
670 |
- usr/lib/libnvidia-cfg.so.${PV} |
671 |
- usr/lib/libvdpau_nvidia.so.${PV} |
672 |
- usr/lib/libOpenCL.so.1.0.0 |
673 |
- usr/lib/libnvidia-compiler.so.${PV}" |
674 |
- |
675 |
-QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko |
676 |
- usr/lib/opengl/nvidia/lib/libGL.so.1 |
677 |
- usr/lib/libnvidia-glcore.so.1 |
678 |
- usr/lib/libnvidia-cfg.so.1 |
679 |
- usr/lib/opengl/nvidia/extensions/libglx.so.1 |
680 |
- usr/lib/xorg/modules/drivers/nvidia_drv.so" |
681 |
- |
682 |
-QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV} |
683 |
- usr/lib32/libnvidia-glcore.so.${PV} |
684 |
- usr/lib32/opengl/nvidia/lib/libGL.so.${PV} |
685 |
- usr/lib32/libcuda.so.${PV} |
686 |
- usr/lib32/libvdpau_nvidia.so.${PV} |
687 |
- usr/lib32/libOpenCL.so.1.0.0 |
688 |
- usr/lib32/libnvidia-compiler.so.${PV}" |
689 |
- |
690 |
-QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV} |
691 |
- usr/lib/libnvidia-glcore.so.${PV} |
692 |
- usr/lib/opengl/nvidia/extensions/libglx.so.${PV} |
693 |
- usr/lib64/libXvMCNVIDIA.so.${PV} |
694 |
- usr/lib/libXvMCNVIDIA.a:NVXVMC.o |
695 |
- usr/lib/libnvidia-compiler.so.${PV} |
696 |
- usr/lib/libvdpau_nvidia.so.${PV} |
697 |
- usr/lib/libcuda.so.${PV} |
698 |
- usr/lib/libOpenCL.so.1.0.0" |
699 |
- |
700 |
-QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV} |
701 |
- usr/lib32/opengl/nvidia/lib/libGL.so.${PV} |
702 |
- usr/lib32/libnvidia-compiler.so.${PV} |
703 |
- usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV} |
704 |
- usr/lib32/libvdpau_nvidia.so.${PV} |
705 |
- usr/lib32/libcuda.so.${PV} |
706 |
- usr/lib32/libOpenCL.so.1.0.0 |
707 |
- usr/lib64/libnvidia-compiler.so.${PV} |
708 |
- usr/lib64/libXvMCNVIDIA.a:NVXVMC.o |
709 |
- usr/lib64/libnvidia-cfg.so.${PV} |
710 |
- usr/lib64/libvdpau_nvidia.so.${PV} |
711 |
- usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV} |
712 |
- usr/lib64/opengl/nvidia/lib/libGL.so.${PV} |
713 |
- usr/lib64/libnvidia-glcore.so.${PV} |
714 |
- usr/lib64/opengl/nvidia/extensions/libglx.so.${PV} |
715 |
- usr/lib64/libXvMCNVIDIA.so.${PV} |
716 |
- usr/lib64/libcuda.so.${PV} |
717 |
- usr/lib64/libOpenCL.so.1.0.0 |
718 |
- usr/lib64/xorg/modules/drivers/nvidia_drv.so |
719 |
- usr/bin/nvidia-smi |
720 |
- usr/bin/nvidia-xconfig |
721 |
- usr/bin/nvidia-settings" |
722 |
- |
723 |
-QA_WX_LOAD_x86="usr/lib/libnvidia-glcore.so.${PV} |
724 |
- usr/lib/opengl/nvidia/lib/libGL.so.${PV} |
725 |
- usr/lib/opengl/nvidia/extensions/libglx.so.${PV} |
726 |
- usr/lib/libXvMCNVIDIA.a |
727 |
- usr/lib64/libXvMCNVIDIA.so.${PV}" |
728 |
- |
729 |
-QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV} |
730 |
- usr/lib32/libnvidia-glcore.so.${PV} |
731 |
- usr/lib64/opengl/nvidia/lib/libGL.so.${PV} |
732 |
- usr/lib64/libnvidia-glcore.so.${PV} |
733 |
- usr/lib64/opengl/nvidia/extensions/libglx.so.${PV} |
734 |
- usr/lib64/libXvMCNVIDIA.so.${PV}" |
735 |
- |
736 |
-QA_SONAME_x86="usr/lib/libnvidia-compiler.so.${PV}" |
737 |
- |
738 |
-QA_SONAME_amd64="usr/lib64/libnvidia-compiler.so.${PV} |
739 |
- usr/lib32/libnvidia-compiler.so.${PV}" |
740 |
- |
741 |
-QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV} |
742 |
- usr/lib32/opengl/nvidia/lib/libGL.so.${PV} |
743 |
- usr/lib32/libnvidia-glcore.so.${PV} |
744 |
- usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV} |
745 |
- usr/lib32/libvdpau_nvidia.so.${PV} |
746 |
- usr/lib32/libOpenCL.so.1.0.0 |
747 |
- usr/lib32/libnvidia-compiler.so.${PV} |
748 |
- usr/lib64/libXvMCNVIDIA.so.${PV} |
749 |
- usr/lib64/libcuda.so.${PV} |
750 |
- usr/lib64/libnvidia-cfg.so.${PV} |
751 |
- usr/lib64/libnvidia-glcore.so.${PV} |
752 |
- usr/lib64/opengl/nvidia/lib/libGL.so.${PV} |
753 |
- usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV} |
754 |
- usr/lib64/opengl/nvidia/extensions/libglx.so.${PV} |
755 |
- usr/lib64/xorg/modules/drivers/nvidia_drv.so |
756 |
- usr/lib64/libvdpau_nvidia.so.${PV} |
757 |
- usr/lib64/libOpenCL.so.1.0.0 |
758 |
- usr/lib64/libnvidia-compiler.so.${PV} |
759 |
- usr/bin/nvidia-smi |
760 |
- usr/bin/nvidia-xconfig |
761 |
- usr/bin/nvidia-settings" |
762 |
- |
763 |
-QA_DT_HASH_x86="usr/lib/libcuda.so.${PV} |
764 |
- usr/lib/libnvidia-cfg.so.${PV} |
765 |
- usr/lib/libnvidia-glcore.so.${PV} |
766 |
- usr/lib/opengl/nvidia/lib/libGL.so.${PV} |
767 |
- usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV} |
768 |
- usr/lib/opengl/nvidia/extensions/libglx.so.${PV} |
769 |
- usr/lib/xorg/modules/drivers/nvidia_drv.so |
770 |
- usr/lib/libXvMCNVIDIA.so.${PV} |
771 |
- usr/lib/libvdpau_nvidia.so.${PV} |
772 |
- usr/lib/libOpenCL.so.1.0.0 |
773 |
- usr/lib/libnvidia-compiler.so.${PV} |
774 |
- usr/bin/nvidia-smi |
775 |
- usr/bin/nvidia-xconfig |
776 |
- usr/bin/nvidia-settings" |
777 |
- |
778 |
-S="${WORKDIR}/" |
779 |
- |
780 |
-mtrr_check() { |
781 |
- ebegin "Checking for MTRR support" |
782 |
- linux_chkconfig_present MTRR |
783 |
- eend $? |
784 |
- |
785 |
- if [[ $? -ne 0 ]] ; then |
786 |
- eerror "Please enable MTRR support in your kernel config, found at:" |
787 |
- eerror |
788 |
- eerror " Processor type and features" |
789 |
- eerror " [*] MTRR (Memory Type Range Register) support" |
790 |
- eerror |
791 |
- eerror "and recompile your kernel ..." |
792 |
- die "MTRR support not detected!" |
793 |
- fi |
794 |
-} |
795 |
- |
796 |
-lockdep_check() { |
797 |
- if linux_chkconfig_present LOCKDEP; then |
798 |
- eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel." |
799 |
- eerror "Unfortunately, this option exports the symbol 'lockdep_init_map' as GPL-only" |
800 |
- eerror "which will prevent ${P} from compiling." |
801 |
- eerror "Please make sure the following options have been unset:" |
802 |
- eerror " Kernel hacking --->" |
803 |
- eerror " [ ] Lock debugging: detect incorrect freeing of live locks" |
804 |
- eerror " [ ] Lock debugging: prove locking correctness" |
805 |
- eerror " [ ] Lock usage statistics" |
806 |
- eerror "in 'menuconfig'" |
807 |
- die "LOCKDEP enabled" |
808 |
- fi |
809 |
-} |
810 |
- |
811 |
-pkg_setup() { |
812 |
- # try to turn off distcc and ccache for people that have a problem with it |
813 |
- export DISTCC_DISABLE=1 |
814 |
- export CCACHE_DISABLE=1 |
815 |
- |
816 |
- if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then |
817 |
- eerror "This ebuild doesn't currently support changing your default abi." |
818 |
- die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" |
819 |
- fi |
820 |
- |
821 |
- if use kernel_linux; then |
822 |
- linux-mod_pkg_setup |
823 |
- MODULE_NAMES="nvidia(video:${S}/kernel)" |
824 |
- BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ |
825 |
- SYSOUT=${KV_OUT_DIR} HOST_CC=$(tc-getBUILD_CC)" |
826 |
- mtrr_check |
827 |
- lockdep_check |
828 |
- fi |
829 |
- |
830 |
- # On BSD userland it wants real make command |
831 |
- use userland_BSD && MAKE="$(get_bmake)" |
832 |
- |
833 |
- export _POSIX2_VERSION="199209" |
834 |
- |
835 |
- # Since Nvidia ships 3 different series of drivers, we need to give the user |
836 |
- # some kind of guidance as to what version they should install. This tries |
837 |
- # to point the user in the right direction but can't be perfect. check |
838 |
- # nvidia-driver.eclass |
839 |
- nvidia-driver-check-warning |
840 |
- |
841 |
- # set variables to where files are in the package structure |
842 |
- if use kernel_FreeBSD; then |
843 |
- NV_DOC="${S}/doc" |
844 |
- NV_EXEC="${S}/obj" |
845 |
- NV_LIB="${S}/obj" |
846 |
- NV_SRC="${S}/src" |
847 |
- NV_MAN="${S}/x11/man" |
848 |
- NV_X11="${S}/obj" |
849 |
- NV_X11_DRV="${NV_X11}" |
850 |
- NV_X11_EXT="${NV_X11}" |
851 |
- NV_SOVER=1 |
852 |
- elif use kernel_linux; then |
853 |
- NV_DOC="${S}" |
854 |
- NV_EXEC="${S}" |
855 |
- NV_LIB="${S}" |
856 |
- NV_SRC="${S}/kernel" |
857 |
- NV_MAN="${S}" |
858 |
- NV_X11="${S}" |
859 |
- NV_X11_DRV="${NV_X11}" |
860 |
- NV_X11_EXT="${NV_X11}" |
861 |
- NV_SOVER=${PV} |
862 |
- else |
863 |
- die "Could not determine proper NVIDIA package" |
864 |
- fi |
865 |
-} |
866 |
- |
867 |
-src_unpack() { |
868 |
- if use kernel_linux && kernel_is lt 2 6 7; then |
869 |
- echo |
870 |
- ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" |
871 |
- ewarn "This is not officially supported for ${P}. It is likely you" |
872 |
- ewarn "will not be able to compile or use the kernel module." |
873 |
- ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7" |
874 |
- echo |
875 |
- ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored." |
876 |
- fi |
877 |
- |
878 |
- if ! use x86-fbsd; then |
879 |
- cd "${S}" |
880 |
- unpack_makeself |
881 |
- else |
882 |
- unpack ${A} |
883 |
- fi |
884 |
-} |
885 |
- |
886 |
-src_prepare() { |
887 |
- # Please add a brief description for every added patch |
888 |
- use x86-fbsd && cd doc |
889 |
- |
890 |
- if use kernel_linux; then |
891 |
- # Quiet down warnings the user does not need to see |
892 |
- sed -i \ |
893 |
- -e 's:-Wsign-compare::g' \ |
894 |
- "${NV_SRC}"/Makefile.kbuild |
895 |
- |
896 |
- # Add support for the 'x86' unified kernel arch in conftest.sh |
897 |
- epatch "${FILESDIR}"/256.35-unified-arch.patch |
898 |
- |
899 |
- # If you set this then it's your own fault when stuff breaks :) |
900 |
- use custom-cflags && sed -i "s:-O:${CFLAGS}:" "${NV_SRC}"/Makefile.* |
901 |
- |
902 |
- # If greater than 2.6.5 use M= instead of SUBDIR= |
903 |
- convert_to_m "${NV_SRC}"/Makefile.kbuild |
904 |
- fi |
905 |
- |
906 |
- epatch "${FILESDIR}/NVIDIA-Linux-x86-${PV}-linux-2.6.36.patch" |
907 |
-} |
908 |
- |
909 |
-src_compile() { |
910 |
- # This is already the default on Linux, as there's no toplevel Makefile, but |
911 |
- # on FreeBSD there's one and triggers the kernel module build, as we install |
912 |
- # it by itself, pass this. |
913 |
- |
914 |
- cd "${NV_SRC}" |
915 |
- if use x86-fbsd; then |
916 |
- MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ |
917 |
- LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die |
918 |
- elif use kernel_linux; then |
919 |
- linux-mod_src_compile |
920 |
- fi |
921 |
-} |
922 |
- |
923 |
-src_install() { |
924 |
- if use kernel_linux; then |
925 |
- linux-mod_src_install |
926 |
- |
927 |
- VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)" |
928 |
- if [ -z "$VIDEOGROUP" ]; then |
929 |
- eerror "Failed to determine the video group gid." |
930 |
- die "Failed to determine the video group gid." |
931 |
- fi |
932 |
- |
933 |
- # Add the aliases |
934 |
- [ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR" |
935 |
- sed -e 's:PACKAGE:'${PF}':g' \ |
936 |
- -e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \ |
937 |
- "${WORKDIR}"/nvidia |
938 |
- insinto /etc/modprobe.d |
939 |
- newins "${WORKDIR}"/nvidia nvidia.conf || die |
940 |
- elif use x86-fbsd; then |
941 |
- insinto /boot/modules |
942 |
- doins "${WORKDIR}/${NV_PACKAGE}/src/nvidia.kld" || die |
943 |
- |
944 |
- exeinto /boot/modules |
945 |
- doexe "${WORKDIR}/${NV_PACKAGE}/src/nvidia.ko" || die |
946 |
- fi |
947 |
- |
948 |
- # NVIDIA kernel <-> userspace driver config lib |
949 |
- dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \ |
950 |
- die "failed to install libnvidia-cfg" |
951 |
- |
952 |
- # Xorg DDX driver |
953 |
- insinto /usr/$(get_libdir)/xorg/modules/drivers |
954 |
- doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so" |
955 |
- |
956 |
- # Xorg GLX driver |
957 |
- insinto /usr/$(get_libdir)/opengl/nvidia/extensions |
958 |
- doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \ |
959 |
- die "failed to install libglx.so" |
960 |
- dosym /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so.${NV_SOVER} \ |
961 |
- /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \ |
962 |
- die "failed to create libglx.so symlink" |
963 |
- |
964 |
- # XvMC driver |
965 |
- dolib.a ${NV_X11}/libXvMCNVIDIA.a || \ |
966 |
- die "failed to install libXvMCNVIDIA.so" |
967 |
- dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \ |
968 |
- die "failed to install libXvMCNVIDIA.so" |
969 |
- dosym libXvMCNVIDIA.so.${NV_SOVER} /usr/$(get_libdir)/libXvMCNVIDIA.so || \ |
970 |
- die "failed to create libXvMCNVIDIA.so symlink" |
971 |
- |
972 |
- # CUDA and OpenCL headers |
973 |
- if use kernel_linux; then |
974 |
- dodir /usr/include/cuda |
975 |
- insinto /usr/include/cuda |
976 |
- doins cuda*.h || die "failed to install cuda headers" |
977 |
- |
978 |
- dodir /usr/include/CL |
979 |
- insinto /usr/include/CL |
980 |
- doins cl*.h || die "failed to install OpenCL headers" |
981 |
- |
982 |
- # OpenCL ICD for NVIDIA |
983 |
- dodir /etc/OpenCL/vendors |
984 |
- insinto /etc/OpenCL/vendors |
985 |
- doins nvidia.icd |
986 |
- fi |
987 |
- |
988 |
- # Documentation |
989 |
- dohtml ${NV_DOC}/html/* |
990 |
- if use x86-fbsd; then |
991 |
- dodoc "${NV_DOC}/README" |
992 |
- doman "${NV_MAN}/nvidia-xconfig.1" |
993 |
- use gtk && doman "${NV_MAN}/nvidia-settings.1" |
994 |
- else |
995 |
- # Docs |
996 |
- newdoc "${NV_DOC}/README.txt" README |
997 |
- dodoc "${NV_DOC}/NVIDIA_Changelog" |
998 |
- doman "${NV_MAN}/nvidia-smi.1.gz" |
999 |
- doman "${NV_MAN}/nvidia-xconfig.1.gz" |
1000 |
- use gtk && doman "${NV_MAN}/nvidia-settings.1.gz" |
1001 |
- fi |
1002 |
- |
1003 |
- # Helper Apps |
1004 |
- dobin ${NV_EXEC}/nvidia-xconfig || die |
1005 |
- use gtk && dobin ${NV_EXEC}/nvidia-settings |
1006 |
- dobin ${NV_EXEC}/nvidia-bug-report.sh || die |
1007 |
- if use kernel_linux; then |
1008 |
- dobin ${NV_EXEC}/nvidia-smi || die |
1009 |
- fi |
1010 |
- |
1011 |
- # Desktop entries for nvidia-settings |
1012 |
- if use gtk; then |
1013 |
- dodir /usr/share/applications/ |
1014 |
- insinto /usr/share/applications/ |
1015 |
- doins ${NV_EXEC}/nvidia-settings.desktop |
1016 |
- sed -e 's:__UTILS_PATH__:/usr/bin:' \ |
1017 |
- -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \ |
1018 |
- -i "${D}"/usr/share/applications/nvidia-settings.desktop |
1019 |
- |
1020 |
- dodir /usr/share/pixmaps/ |
1021 |
- insinto /usr/share/pixmaps/ |
1022 |
- doins ${NV_EXEC}/nvidia-settings.png |
1023 |
- fi |
1024 |
- |
1025 |
- if has_multilib_profile ; then |
1026 |
- local OABI=${ABI} |
1027 |
- for ABI in $(get_install_abis) ; do |
1028 |
- src_install-libs |
1029 |
- done |
1030 |
- ABI=${OABI} |
1031 |
- unset OABI |
1032 |
- else |
1033 |
- src_install-libs |
1034 |
- fi |
1035 |
- |
1036 |
- is_final_abi || die "failed to iterate through all ABIs" |
1037 |
-} |
1038 |
- |
1039 |
-# Install nvidia library: |
1040 |
-# the first parameter is the place where to install it |
1041 |
-# the second parameter is the base name of the library |
1042 |
-# the third parameter is the provided soversion |
1043 |
-donvidia() { |
1044 |
- dodir $1 |
1045 |
- exeinto $1 |
1046 |
- |
1047 |
- libname=$(basename $2) |
1048 |
- |
1049 |
- doexe $2.$3 || die "failed to install $2" |
1050 |
- dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2" |
1051 |
- [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 |
1052 |
-} |
1053 |
- |
1054 |
-src_install-libs() { |
1055 |
- local inslibdir=$(get_libdir) |
1056 |
- local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" |
1057 |
- local libdir= sover= |
1058 |
- |
1059 |
- if use kernel_linux; then |
1060 |
- if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then |
1061 |
- libdir=32 |
1062 |
- else |
1063 |
- libdir=. |
1064 |
- fi |
1065 |
- sover=${PV} |
1066 |
- else |
1067 |
- libdir=obj |
1068 |
- # on FreeBSD it has just .1 suffix |
1069 |
- sover=1 |
1070 |
- fi |
1071 |
- |
1072 |
- # The GLX libraries |
1073 |
- donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover} |
1074 |
- donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover} |
1075 |
- if use x86-fbsd; then |
1076 |
- donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover} |
1077 |
- else |
1078 |
- donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover} |
1079 |
- fi |
1080 |
- |
1081 |
- # VDPAU |
1082 |
- donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover} |
1083 |
- |
1084 |
- # CUDA & OpenCL |
1085 |
- if use kernel_linux; then |
1086 |
- donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover} |
1087 |
- donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover} |
1088 |
- donvidia /usr/${inslibdir} ${libdir}/libOpenCL.so 1.0.0 |
1089 |
- dosym libOpenCL.so.1 /usr/${inslibdir}/libOpenCL.so |
1090 |
- fi |
1091 |
-} |
1092 |
- |
1093 |
-pkg_preinst() { |
1094 |
- if use kernel_linux; then |
1095 |
- linux-mod_pkg_postinst |
1096 |
- fi |
1097 |
- |
1098 |
- # Clean the dynamic libGL stuff's home to ensure |
1099 |
- # we dont have stale libs floating around |
1100 |
- if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then |
1101 |
- rm -rf "${ROOT}"/usr/lib/opengl/nvidia/* |
1102 |
- fi |
1103 |
- # Make sure we nuke the old nvidia-glx's env.d file |
1104 |
- if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then |
1105 |
- rm -f "${ROOT}"/etc/env.d/09nvidia |
1106 |
- fi |
1107 |
-} |
1108 |
- |
1109 |
-pkg_postinst() { |
1110 |
- if use kernel_linux; then |
1111 |
- linux-mod_pkg_postinst |
1112 |
- fi |
1113 |
- |
1114 |
- # Switch to the nvidia implementation |
1115 |
- eselect opengl set --use-old nvidia |
1116 |
- |
1117 |
- echo |
1118 |
- elog "You must be in the video group to use the NVIDIA device" |
1119 |
- elog "For more info, read the docs at" |
1120 |
- elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6" |
1121 |
- elog |
1122 |
- |
1123 |
- elog "This ebuild installs a kernel module and X driver. Both must" |
1124 |
- elog "match explicitly in their version. This means, if you restart" |
1125 |
- elog "X, you must modprobe -r nvidia before starting it back up" |
1126 |
- elog |
1127 |
- |
1128 |
- elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\"" |
1129 |
- elog |
1130 |
- elog "NVIDIA has requested that any bug reports submitted have the" |
1131 |
- elog "output of /usr/bin/nvidia-bug-report.sh included." |
1132 |
- elog |
1133 |
- elog "To work with compiz, you must enable the AddARGBGLXVisuals option." |
1134 |
- elog |
1135 |
- elog "If you are having resolution problems, try disabling DynamicTwinView." |
1136 |
- echo |
1137 |
-} |
1138 |
- |
1139 |
-pkg_postrm() { |
1140 |
- if use kernel_linux; then |
1141 |
- linux-mod_pkg_postrm |
1142 |
- fi |
1143 |
- eselect opengl set --use-old xorg-x11 |
1144 |
-} |