diff options
| author |   wbrana <wbrana@gmail.com> | 2012-12-01 14:59:25 +0100 |
|---|---|---|
| committer | wbrana <wbrana@gmail.com> | 2012-12-01 14:59:25 +0100 |
| commit | b73bef1fe6ad7ae5b5178a34aaf12d63d99d628d (patch) | |
| tree | 1f57498ba5fd8c25ba9b5e2ed01a813b3926f68c | |
| parent | remove readahead (diff) | |
| download | wbrana-b73bef1fe6ad7ae5b5178a34aaf12d63d99d628d.tar.gz wbrana-b73bef1fe6ad7ae5b5178a34aaf12d63d99d628d.tar.bz2 wbrana-b73bef1fe6ad7ae5b5178a34aaf12d63d99d628d.zip | |
[x11-drivers/nvidia-drivers] remove
22 files changed, 0 insertions, 1014 deletions
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest deleted file mode 100644 index 671bc6c..0000000 --- a/x11-drivers/nvidia-drivers/Manifest +++ /dev/null @@ -1,22 +0,0 @@ -AUX 09nvidia 61 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39 SHA512 14c47fa164bde3422b64224e3e46e0a6097599de6193b6d36eb162271d41130f0498f6aee09f5cb60fe43727bf74051f9127afa1b4af42efc28d40af2e4fa86f WHIRLPOOL 34bc9975d132da84506a61a119a5d8d8b5be35af5c1511b5e3228fa3d9f0f3b7f84821c0ab09252054d1471ac7901522309d440c82342d6dfdd2beb73f680460 -AUX 195.30-unified-arch.patch 1525 SHA256 b6224e213820c698315a8645204d992b779f31e8c45c025e740bc189dc1f9bae SHA512 64994be7e26e1f8b5dcff386b9573df92861611a724ba0415b83c09326be261722fd8f13d5bb19bd11924fcd10da34913044ff363c384d307367de8b81c9c8f6 WHIRLPOOL 461c56f82a7a05c031f43b38dcfe282ed205239ced006beccdecaa47a796618e94b665667a9a2e857c80d69425aef0767d7e637b745f1a3f63fe590fdfd471df -AUX 256.35-unified-arch.patch 1380 SHA256 5e84bb51e0f9b3ceba270d53ad2a739dc534861df9acd6ab6852670f5a1357d7 SHA512 ddc4cf0275aa842bd98fd78f04837da4d98c3acce08e90d2ca81cfe3619f614cc6bb3a8e569268df226f982823b55e9cd6df292ef7027da191e407240092920e WHIRLPOOL 58203e13f9a3f650eec55ca6fd488fde8ecd055e0521ba0ba45804aef148fc978e59a2e84a1639f2c5f3eafe6d695773ce1e080e59ea03aee4bc2d02758e225a -AUX 50nvidia-prelink-blacklist 319 SHA256 61adce61498451898c22fb538151379438729957418eacf4f69195b3e03ec1f4 SHA512 7252b464c45669bb402859ddb2c95f4553a37027870b6aeada3e1dd58fefe7b4713d3486d301177efdcd7559dbc31ceb6078220d5c0187bdc636d817a98e1a41 WHIRLPOOL 93e14ed7c8fb5dba87295c87e1e8906afac290f63dc6ea023fa6c387ed47ff13d488b3b24c400aee42a22737856a7782925d9a3a412ddcd1984dbbd7e51579a5 -AUX NVIDIA_glx-defines.patch 437 SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da SHA512 a9cbbe5d5d362db0eb92d5b9fe87f28cccb600df9b44ae2b323ed08da97c32d6a4a0553c7c82ea3777ab91a1a4bf6b74f04d89b6ec28e60565e677cc4af48351 WHIRLPOOL a826b11c86803530346a65612ebd1a12f77f6c6ba1d93af597435993086451648b825fbc245a2c5850e0680c58129924843744d7e29013d5087c3b4dd9fefb14 -AUX NVIDIA_glx-glheader.patch 380 SHA256 f630e24067bf6199a64f8fe8c5d6fc158cb4b153bda65ffc3f97b36a9cb08faf SHA512 366ebbe967001f4d694e9d6ae61fbd8b57e2946bba495894936809634bb87bd6ba6b10689969977e4d0eaba6983c16fe8d78830112b5b28f01c78381a0a095d6 WHIRLPOOL 8609fcedb439299189d9d05606a290a63de8b207bab855f874faa36e892396f41159d26e505dfead89fdac9d7e61aeeb50b16877aa14ad62dc3cd617353d7d60 -AUX libGL.la-r2 733 SHA256 4856e7a2c31763ade41c93a395f3e80a2705ac2ab4dbd73e5161cdba132f407b SHA512 52fbc3d704274fc5403b95a5d696824684302f4a77e0b08d5a59850435b12d9bdc4cf931f346f91e950f246cc342e0a673e7657cc2cea95e991ed3aab8c1c928 WHIRLPOOL 6a0006277a8444b4b5191a7e07c972efde43c3a9ff8a7286d1d1f78c69c3ba394572f31716b684f1e28355572a6e9f9cbd5437bb9dba127d727f8789fbd2a980 -AUX nvidia 1510 SHA256 b193cc3f6d6f39138720a2282d9f161fc8f2e8a15bc43d183a30eb879add06c5 SHA512 4ffdf49c2634b261be122a0016b0f69d30db6fe4b4a29767cfeee2e1d60671e7e6fc5e5c3a237b351a4def64404db121cf296a0cdb6e1bbd4f8e78ab40587000 WHIRLPOOL faab4c87940e4703b2a30f284cae34bdf4ac486cb1d402b5bd91ef65c23f443c2c961ad914fbcbd5258dd5bbaeee583f189fcf5fc14f2b9925c8ccfa0fc422c7 -AUX nvidia-169.07 639 SHA256 a8c4860f008d53776fda7a17b59524f271236559af688e9a2c9845cbbcba1577 SHA512 3af295c026280dc3a2b73c2cc7772254686b09cad15f1333ab0b4de8cb0ccf78e725ced2a399b10edcf8af6ba42ab1485dc0661af67461b0c3789f786357772f WHIRLPOOL 626ae3c01c879e0cfe05bd373e0b9dfd6f462dd9ef6ae94a7d60276fe2d17c57fbb20aaa4d2a186a0ffc2a860076692aac854d00a3545bc9736e7bb8d0581055 -AUX nvidia-2.6.38-hardened.diff 568 SHA256 f9c779d7aedf63911cba5772a5ef3c24d42e0fb053ba3eaaeb4064e4ae5709e8 SHA512 803b08abe032fb780967f837c5adf4bcf89ac47da1139ad2248a1ce8081a28c3eb1884228fae8beea37d1d96b3524bfb47606784ce7decea8f10271eeb04f409 WHIRLPOOL 68ed061b31222a73a257a890473333241db11e88cc6705c5ea3686f17bdb36f64c6f313f70bf4a481804b3971dab82bf4bd0c74528e0d0f9990c7090055a83a3 -AUX nvidia-autostart.desktop 227 SHA256 e3a5e60998b7cf9a48beefa27b47336fcf4b1f1bbcb97ed8b485e2c7e82083c2 SHA512 eaa953440245901474660163e2f7f93be8e10ae8613dd4d0af64c807363cfa30054cfa360d0c2d610a506637f2588a2120026863364845e1b91054eca324683e WHIRLPOOL cb2b7236213da5d017a193851c132501ca72179677cb1b05cb4bbed48db2d739fbeb09e60043fe70ae10ccfdce53f5cc4f34525a5ffec4843e80624870c84864 -AUX nvidia-blacklist-vga-pmu-registers-256-304.diff 1713 SHA256 674a51e77beb3e076dd29b1d9a37ee23e1498ab128490ea2efb2140e45b44fde SHA512 abf4642278a4da01cefaea4abb116a3229b21c487c0e42d388561af3032d307fee734f5acd792efd4f4dd60e6a8ec18220f2a906c4cd82e71db769248e15c157 WHIRLPOOL 0bcdbf14ca6b4c6abc59ea6ca60da2feb7ff36739574290da109055f8153caf8a0adb6d0534e5ff43d814ba1dff24f894d18811f4c89b61565d2c1f4975213f8 -AUX nvidia-drivers-173.14.30-2.6.39.patch 599 SHA256 f1528152fb786d74701bd5d99ccbabad0b1ac791958d83c17bf783484dda9474 SHA512 63a0ee5c2c005e3088ef9bf651e8c2a916d7533fec4a64523400d75f5a585a3dd5c1561a1323b9a21e3b026c91c0b26cb5b1d4af1c5497e8b6b3de8e465b0e52 WHIRLPOOL d188c2527aebf69bb6414f0c3c01ee6984abf481cff2a7165aecc9b92f470b8c9e461ea5510c0c4be1f8b96eaa6f159402eb2d85deee3b8ce5ddb30790f8353e -AUX nvidia-drivers-190.53-2.6.33.patch 2893 SHA256 68f5cdf4489fb6bc480319e4bda6e6481beb189cf37920b939b8f7bbf77aed1f SHA512 e6d4b1735c49b64f6b6f5a55273fe052913dfa775d1d3e6a76316e6d78dead566ebf4e695a30cd1e4fb25eb3e22572fcef2817fa4ea7f24dfdf5aea8b4db7ea8 WHIRLPOOL 09383431cce49789982827ee47016377623b124a7af8def45acb5c3bfb74839e09d46ca37e6331649983f4c3427a1d2f854fdd83023527addd8cadeef8327d01 -AUX nvidia-drivers-260.19.44-2.6.39.patch 591 SHA256 dc9478bb4ff12d820f82bb13a8d7f956456ea97217ba89e6619f1c8d72127be3 SHA512 c9b39c51e6ec3bae4621e175c4ef691adb2b3928b4c411e66cc97a85bb141ee56ffa5a9b0bf0b5b840a37f4c218b75f79cc1c19d323170ca1cc8010ac5580acd WHIRLPOOL c4e3e116a0ad7a01e28d4773786e4d7c9652d0e6f3895ff0634a03a4ad9e49d9d45f91c0171fdf5b5a9bff67d8b577a8b6ada9190bf6f4b5f5a788e78d3060c8 -AUX nvidia-drivers-275.19-pax-const.patch 833 SHA256 74ba8aa3b03e1b4a0515fd84c159eaeb7635fa1364e77544b01ff6f571f0e6d8 SHA512 6ef94db71cab2dd47273eaed1857209d03ef648d268c7645f3ca4caf6b894590e42a8e716e4354f2eed656e7d55a4c1774b1e6a4be215fbf59fc9d0b1a5762a0 WHIRLPOOL 1b2d737ee7ccee831c85bd8af9605c0633fd025bb209e6d76c13f49a5664aa490bd5b6ce48855e541fe87380cd7b723162e1965b803e1ed630f239bf4dbd0d19 -AUX nvidia-drivers-settings.desktop 193 SHA256 31c062449b8bcc8adcd3ee649d8aebf0bef502400bcbbbb46124217e1efb17a3 SHA512 fbb81d2520e9025fbffb2a8e7b3647f621ddc9d36c79d063d49e901286e8d1ea45de1274f42e33ff1aece5cebd547a42829d65b421db39d808947554b0f57453 WHIRLPOOL c797eb0ec1044ecaaa979ca5180f840d9c82c5c040dd81b2d86ca4afade9f0c006fb8951f04cc4d2b206110d38b339690386d291ff8f625a22b38178a3cd970b -AUX nvidia-smi.init 671 SHA256 5776a661b510e072d34e779c23dfc710a13d04c49acc22772d2aeb0e415820d6 SHA512 f71bcdf2fcaf4aac69056a04f3e57c9f5e4d6c210fe571704d3f9a0798cc9615cd0560840ae336744f43563528db5b9a7b67730895eff438be330b13ab863ed6 WHIRLPOOL db48549b0d2b02d2f9ca6a86f38229dae67853939ac1c2147d5066b9b8958c2e0fb8539f70ddf5c92ae6ad642bb48ea8b1119d1779c80dd66bb450240fd0b40a -AUX nvidia-udev.sh 185 SHA256 120c0af2b64fbcbd7032217a78eec8b104874c1ca68726367bce22c57944e07e SHA512 166df3a4e7c1862ca2e0f634bf5eed7aad1bdd7e55764ca42371b91a7077c59f0bc243de5616fd38dac9694159d1695d54fbd08ac89d4d3f3649c70c7db5977e WHIRLPOOL cb9995029cdb2fe1bc7fe5ae54041ee5de8da86bf5eb3616d062475e56c44d436e1e66683ecddd986fc5bca5723d88da4b1a42f65f3cd7e15636928bd21fce14 -AUX nvidia.udev-rule 462 SHA256 37b152a5055a16d1947171567178e2841679ddf03dba9d48e7d30f1e3b469ac6 SHA512 96f9edaa0b46bea5fce17596f868bea5265b303d7185af6ba81527bbd7b8fdf92de9311317cbde51a29d222083d451c25ab77c3d6837cbc4072a50d9af89aa86 WHIRLPOOL 89ed95f33db7485a3a1acd91df33ecdfb7d0a249db2d7674f134fb85b35a54653d0458e478503315ce506ae5d3c8dcd4ac20420711fdbdd087ea4bd779627d13 -DIST NVIDIA-Linux-x86_64-295.71.run 58537709 SHA256 956c7660bff61c07a99cea2130e73baf1574907008d41d9462147aad6b83dcc6 SHA512 7eb21240ca44a648c081e38aab3ae6203ca70f2dd4ab187c67ef1f3cff9ab848f4040a640dfbd1f146135b37b98c6976943ff6caef8806a25784ff2263d23e8d WHIRLPOOL ea85d8fe42b15f7a7933b8dd3e31a48549a7dd411f21f60b69986fda8b2b4b53c6148194227097be6bc5323b448a5a8c452c784591e32281be576403e3caa435 -EBUILD nvidia-drivers-295.71-r120809.ebuild 18181 SHA256 cbf30bf0557998642221a8379bf256390014b826fef2aad659c5fee1a567d83e SHA512 d46321fc4ad38e0ae7c48b6b7676953f69d7edb2aa5f2e570b20f855bd1057d8e8a40f047e62fd9ca2b202e82ead23668f75a5b864a379e385742a99e7698a89 WHIRLPOOL 60800f19832685d5c37543238aa20a25cc114f5817bb1f277d2928800b267a9d1a2fff744053349c1f58adff5f40c42a5bafb0ee1bada5963ff64de7591b6769 diff --git a/x11-drivers/nvidia-drivers/files/09nvidia b/x11-drivers/nvidia-drivers/files/09nvidia deleted file mode 100644 index 1fcbef4..0000000 --- a/x11-drivers/nvidia-drivers/files/09nvidia +++ /dev/null @@ -1,2 +0,0 @@ -# Has to precede X11's own libraries! -LDPATH=/opt/nvidia/lib diff --git a/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch b/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch deleted file mode 100644 index eff06a5..0000000 --- a/x11-drivers/nvidia-drivers/files/195.30-unified-arch.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 ---- NVIDIA-Linux-x86_64-195.30-pkg2-orig/usr/src/nv/conftest.sh 2010-02-07 22:53:38.000000000 +0100 -+++ NVIDIA-Linux-x86_64-195.30-pkg2/usr/src/nv/conftest.sh 2010-02-07 22:57:10.000000000 +0100 -@@ -82,7 +82,7 @@ build_cflags() { - - if [ "$OUTPUT" != "$SOURCES" ]; then - MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -91,7 +91,7 @@ build_cflags() { - fi - else - MACH_CFLAGS="-I$HEADERS/asm/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -102,7 +102,7 @@ build_cflags() { - - CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS" - -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" - fi - if [ -n "$BUILD_PARAMS" ]; then diff --git a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch b/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch deleted file mode 100644 index 401ce95..0000000 --- a/x11-drivers/nvidia-drivers/files/256.35-unified-arch.patch +++ /dev/null @@ -1,31 +0,0 @@ -Add support for the 'x86' unified kernel arch in conftest.sh - ---- NVIDIA-Linux-x86-256.25/kernel/conftest.sh -+++ NVIDIA-Linux-x86-256.25/kernel/conftest.sh -@@ -101,7 +101,7 @@ build_cflags() { - - if [ "$OUTPUT" != "$SOURCES" ]; then - MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -110,7 +110,7 @@ build_cflags() { - fi - else - MACH_CFLAGS="-I$HEADERS/asm/mach-default" -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" - fi -@@ -121,7 +121,7 @@ build_cflags() { - - CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" - -- if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -+ if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" -o "$ARCH" = "x86" ]; then - CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" - fi - if [ -n "$BUILD_PARAMS" ]; then diff --git a/x11-drivers/nvidia-drivers/files/50nvidia-prelink-blacklist b/x11-drivers/nvidia-drivers/files/50nvidia-prelink-blacklist deleted file mode 100644 index 5e139de..0000000 --- a/x11-drivers/nvidia-drivers/files/50nvidia-prelink-blacklist +++ /dev/null @@ -1 +0,0 @@ -PRELINK_PATH_MASK="/usr/lib{,64}/tls/libnvidia-tls*:/usr/lib{,64}/libnvidia*:/usr/lib{,64}/libGL*:/usr/lib{,64}/opengl/nvidia/*:/usr/lib{,64}/OpenCL/vendors/nvidia/*:/usr/lib{,64}/xorg/modules/drivers/nvidia*:/usr/lib{,64}/libvdpau_nvidia*:/usr/lib{,64}/libXvMCNVIDIA*:/usr/lib{,64}/libcuda*:/usr/lib{,64}/libnvcuvid*" diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch deleted file mode 100644 index da9933f..0000000 --- a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-defines.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h ---- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h 2002-12-09 21:26:55.000000000 +0100 -+++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h 2003-01-30 18:20:23.000000000 +0100 -@@ -39,6 +39,7 @@ - typedef XID GLXPixmap; - typedef XID GLXDrawable; - typedef XID GLXPbuffer; -+typedef XID GLXPbufferSGIX; - typedef XID GLXWindow; - typedef XID GLXFBConfigID; - diff --git a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch b/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch deleted file mode 100644 index e0393e1..0000000 --- a/x11-drivers/nvidia-drivers/files/NVIDIA_glx-glheader.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- usr/include/GL/gl.g.orig 2004-07-17 19:56:59.789410584 +1000 -+++ usr/include/GL/gl.h 2004-07-17 19:59:08.844791184 +1000 -@@ -66,6 +66,10 @@ - typedef double GLclampd; - typedef void GLvoid; - -+/* Patching for some better defines in the global system */ -+#ifndef GL_GLEXT_LEGACY -+#include <GL/glext.h> -+#endif - - /*************************************************************/ - diff --git a/x11-drivers/nvidia-drivers/files/libGL.la-r2 b/x11-drivers/nvidia-drivers/files/libGL.la-r2 deleted file mode 100644 index 863d184..0000000 --- a/x11-drivers/nvidia-drivers/files/libGL.la-r2 +++ /dev/null @@ -1,32 +0,0 @@ -# libGL.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGL.so.1' - -# Names of this library. -library_names='libGL.so.${PV} libGL.so.1 libGL.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs='-L/usr/${libdir} -lm -lX11 -lXext -ldl' - -# Version information for libGL. -current=${ver1} -age=${ver2} -revision=${ver3} - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/${libdir}' diff --git a/x11-drivers/nvidia-drivers/files/nvidia b/x11-drivers/nvidia-drivers/files/nvidia deleted file mode 100644 index 7cf0f7c..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia +++ /dev/null @@ -1,40 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/PACKAGE/README -# -# To enable Side Band Adressing: NVreg_EnableAGPSBA=1 -# -# To enable Fast Writes: NVreg_EnableAGPFW=1 -# -# To enable both for instance, uncomment following line: -# -#options nvidia NVreg_EnableAGPSBA=1 NVreg_EnableAGPFW=1 -# If you have a mobile chip, you may need to enable this option -# if you have hard lockups when starting X. -# -# See: Appendix I. Configuring your laptop -# In /usr/share/doc/PACKAGE/README for full details -# -# Choose the appropriate value for NVreg_Mobile from the table: -# Value Meaning -# ---------- -------------------------------------------------- -# 0xFFFFFFFF let the kernel module autodetect the correct value -# 1 Dell laptops -# 2 non-Compal Toshiba laptops -# 3 all other laptops -# 4 Compal Toshiba laptops -# 5 Gateway laptops -# -#options nvidia NVreg_SoftEDIDs=0 NVreg_Mobile=3 - - -# !!! SECURITY WARNING !!! -# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW -# WHAT YOU ARE DOING. -# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, -# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. -options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07 deleted file mode 100644 index a96b0cd..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-169.07 +++ /dev/null @@ -1,14 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/PACKAGE/README -# -# !!! SECURITY WARNING !!! -# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW -# WHAT YOU ARE DOING. -# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, -# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. -options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-2.6.38-hardened.diff b/x11-drivers/nvidia-drivers/files/nvidia-2.6.38-hardened.diff deleted file mode 100644 index 8176182..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-2.6.38-hardened.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- kernel/nv-linux.h.orig 2010-08-28 05:28:03.000000000 +0200 -+++ kernel/nv-linux.h 2011-05-27 12:47:08.175727041 +0200 -@@ -639,7 +639,7 @@ - #define NV_KMEM_CACHE_CREATE(kmem_cache, name, type) \ - { \ - kmem_cache = kmem_cache_create(name, sizeof(type), \ -- 0, 0, NULL); \ -+ 0, SLAB_USERCOPY, NULL); \ - } - #else - #error "NV_KMEM_CACHE_CREATE_ARGUMENT_COUNT value unrecognized!" diff --git a/x11-drivers/nvidia-drivers/files/nvidia-autostart.desktop b/x11-drivers/nvidia-drivers/files/nvidia-autostart.desktop deleted file mode 100644 index 3878b99..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-autostart.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=NVIDIA X Server Settings -Comment=Configure NVIDIA X Server Settings -Exec=sh -c '/opt/bin/nvidia-settings --load-config-only' -Terminal=false -Icon=nvidia-settings -Categories=System;Settings; diff --git a/x11-drivers/nvidia-drivers/files/nvidia-blacklist-vga-pmu-registers-256-304.diff b/x11-drivers/nvidia-drivers/files/nvidia-blacklist-vga-pmu-registers-256-304.diff deleted file mode 100644 index 9cfde6a..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-blacklist-vga-pmu-registers-256-304.diff +++ /dev/null @@ -1,25 +0,0 @@ -diff -ur kernel/nv.h kernel/nv.h ---- kernel/nv.h 2012-08-02 18:19:37.000000000 -0700 -+++ kernel/nv.h 2012-08-02 18:19:37.000000000 -0700 -@@ -448,7 +448,20 @@ - - #define IS_BLACKLISTED_REG_OFFSET(nv, offset, length) \ - ((IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1000, 0x1000, offset, length)) ||\ -- (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x700000, 0x100000, offset, length))) -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x84000, 0x1000, offset, length)) ||\ -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x85000, 0x1000, offset, length)) ||\ -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x86000, 0x1000, offset, length)) ||\ -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x87000, 0x1000, offset, length)) ||\ -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x89000, 0x1000, offset, length)) ||\ -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0xa0000, 0x20000, offset, length)) ||\ -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x104000, 0x1000, offset, length)) ||\ -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x105000, 0x1000, offset, length)) ||\ -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x10a000, 0x1000, offset, length)) ||\ -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1c2000, 0x1000, offset, length)) ||\ -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1c3000, 0x1000, offset, length)) ||\ -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x618000, 0x2000, offset, length)) ||\ -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x627000, 0x1000, offset, length)) ||\ -+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x700000, 0x100000, offset, length))) - - /* duplicated from nvos.h for external builds */ - #ifndef NVOS_AGP_CONFIG_DISABLE_AGP diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch deleted file mode 100644 index de93e0b..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-173.14.30-2.6.39.patch +++ /dev/null @@ -1,14 +0,0 @@ -linux/smp_lock.h no longer exists in linux-2.6.39+ - ---- a/usr/src/nv/nv-linux.h -+++ b/usr/src/nv/nv-linux.h -@@ -87,7 +87,9 @@ - #if !defined(KERNEL_2_4) - #include <linux/sched.h> /* suser(), capable() replacement */ - #include <linux/moduleparam.h> /* module_param() */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) - #include <linux/smp_lock.h> /* kernel_locked */ -+#endif - #include <asm/tlbflush.h> /* flush_tlb(), flush_tlb_all() */ - #include <asm/kmap_types.h> /* page table entry lookup */ - #endif 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 deleted file mode 100644 index 75daad3..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-190.53-2.6.33.patch +++ /dev/null @@ -1,92 +0,0 @@ -Index: usr/src/nv/conftest.sh -=================================================================== ---- usr/src/nv/conftest.sh -+++ usr/src/nv/conftest.sh 2010-01-06 12:10:56.000000000 +0530 -@@ -32,14 +32,14 @@ - # CONFIG_XEN and CONFIG_PARAVIRT are present, text_xen() treats - # the kernel as a stand-alone kernel. - # -- FILE="linux/autoconf.h" -+ FILE="generated/autoconf.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - # - # We are looking at a configured source tree; verify - # that it's not a Xen kernel. - # -- echo "#include <linux/autoconf.h> -+ echo "#include <generated/autoconf.h> - #if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT) - #error CONFIG_XEN defined! - #endif -@@ -111,7 +111,12 @@ - fi - } - --CONFTEST_PREAMBLE="#include <linux/autoconf.h> -+CONFTEST_PREAMBLE="#include <linux/version.h> -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33) -+ #include <generated/autoconf.h> -+ #else -+ #include <linux/autoconf.h> -+ #endif - #if defined(CONFIG_XEN) && \ - defined(CONFIG_XEN_INTERFACE_VERSION) && !defined(__XEN_INTERFACE_VERSION__) - #define __XEN_INTERFACE_VERSION__ CONFIG_XEN_INTERFACE_VERSION -@@ -1294,7 +1299,7 @@ - echo ""; - fi - fi -- exit $RET -+# exit $RET - ;; - - get_uname) -@@ -1316,11 +1321,11 @@ - # tree or at headers shipped for a specific kernel. - # Determine the kernel version using a compile check. - # -- FILE="linux/utsrelease.h" -+ FILE="generated/utsrelease.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - echo "$CONFTEST_PREAMBLE -- #include <linux/utsrelease.h> -+ #include <generated/utsrelease.h> - int main() { - printf(\"%s\", UTS_RELEASE); - return 0; -@@ -1375,7 +1380,7 @@ - # - RET=1 - VERBOSE=$6 -- FILE="linux/autoconf.h" -+ FILE="generated/autoconf.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - # -@@ -1429,7 +1434,7 @@ - # - RET=1 - VERBOSE=$6 -- FILE="linux/autoconf.h" -+ FILE="generated/autoconf.h" - - if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then - # -Index: usr/src/nv/nvacpi.c -=================================================================== ---- usr/src/nv/nvacpi.c -+++ usr/src/nv/nvacpi.c 2010-01-06 12:10:56.000000000 +0530 -@@ -49,6 +49,10 @@ - }; - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) -+#define acpi_walk_namespace(a,b,c,d,e,f) acpi_walk_namespace(a,b,c,d,e,f,NULL) -+#endif -+ - static struct acpi_driver *nv_acpi_driver; - static acpi_handle nvif_handle = NULL; - static acpi_handle dsm_handle = NULL; - diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch deleted file mode 100644 index a1d3eb8..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-260.19.44-2.6.39.patch +++ /dev/null @@ -1,14 +0,0 @@ -linux/smp_lock.h no longer exists in linux-2.6.39+ - ---- a/kernel/nv-linux.h -+++ b/kernel/nv-linux.h -@@ -87,7 +87,9 @@ - #if !defined(KERNEL_2_4) - #include <linux/sched.h> /* suser(), capable() replacement */ - #include <linux/moduleparam.h> /* module_param() */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) - #include <linux/smp_lock.h> /* kernel_locked */ -+#endif - #include <asm/tlbflush.h> /* flush_tlb(), flush_tlb_all() */ - #include <asm/kmap_types.h> /* page table entry lookup */ - #endif diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-275.19-pax-const.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-275.19-pax-const.patch deleted file mode 100644 index f3b8259..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-275.19-pax-const.patch +++ /dev/null @@ -1,17 +0,0 @@ -Binary files kernel.orig/.nv-procfs.c.swp and kernel/.nv-procfs.c.swp differ -diff -urp kernel.orig/nv-procfs.c kernel/nv-procfs.c ---- kernel.orig/nv-procfs.c 2011-07-13 03:29:30.000000000 +0200 -+++ kernel/nv-procfs.c 2011-07-19 15:45:27.982993911 +0200 -@@ -707,8 +707,10 @@ int nv_register_procfs(void) - * However, in preparation for this, we need to preserve - * the procfs read() and write() operations. - */ -- nv_procfs_registry_fops.read = entry->proc_fops->read; -- nv_procfs_registry_fops.write = entry->proc_fops->write; -+ pax_open_kernel(); -+ *(void **)&nv_procfs_registry_fops.read = entry->proc_fops->read; -+ *(void **)&nv_procfs_registry_fops.write = entry->proc_fops->write; -+ pax_close_kernel(); - - entry = NV_CREATE_PROC_FILE("registry", proc_nvidia, - nv_procfs_read_registry, diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-settings.desktop b/x11-drivers/nvidia-drivers/files/nvidia-drivers-settings.desktop deleted file mode 100644 index 773a5af..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-drivers-settings.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -Name=NVIDIA X Server Settings -Comment=Configure NVIDIA X Server Settings -Exec=/opt/bin/nvidia-settings -Icon=nvidia-drivers-settings -Categories=System;Settings; diff --git a/x11-drivers/nvidia-drivers/files/nvidia-smi.init b/x11-drivers/nvidia-drivers/files/nvidia-smi.init deleted file mode 100644 index 2cfd4c4..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-smi.init +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/files/nvidia-smi.init,v 1.1 2012/07/22 21:08:43 cardoe Exp $ - -pidfile="/var/run/nvidia-smi.pid" - -depend() { - after modules -} - -start() { - ebegin "Starting NVIDIA System Management Interface" - rm -f ${pidfile} - start-stop-daemon --start --quiet --pidfile ${pidfile} \ - --make-pidfile --background --exec /opt/bin/nvidia-smi -- \ - -q -l 300 - eend $? -} - -stop() { - ebegin "Stopping NVIDIA System Management Interface" - start-stop-daemon --stop --quiet --pidfile ${pidfile} - eend $? -} diff --git a/x11-drivers/nvidia-drivers/files/nvidia-udev.sh b/x11-drivers/nvidia-drivers/files/nvidia-udev.sh deleted file mode 100644 index 9487b08..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-udev.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -if [ $# -ne 1 ]; then - echo "Invalid args" >&2 - exit 1 -fi - -case $1 in - add|ADD) - /opt/bin/nvidia-smi > /dev/null - ;; - remove|REMOVE) - rm -f /dev/nvidia* - ;; -esac - -exit 0 diff --git a/x11-drivers/nvidia-drivers/files/nvidia.udev-rule b/x11-drivers/nvidia-drivers/files/nvidia.udev-rule deleted file mode 100644 index 2eb30bb..0000000 --- a/x11-drivers/nvidia-drivers/files/nvidia.udev-rule +++ /dev/null @@ -1,6 +0,0 @@ -ACTION=="add", DEVPATH=="/module/nvidia", SUBSYSTEM=="module", RUN+="nvidia-udev.sh $env{ACTION}" -# Previously the ACTION was "add|remove" but one user on bug #376527 had a -# problem until he recompiled udev-171-r5, which is one of the versions I -# tested with and it was fine. I'm breaking the rules out just to be safe -# so someone else doesn't have an issue -ACTION=="remove", DEVPATH=="/module/nvidia", SUBSYSTEM=="module", RUN+="nvidia-udev.sh $env{ACTION}" diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-295.71-r120809.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-295.71-r120809.ebuild deleted file mode 100644 index 196774e..0000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-295.71-r120809.ebuild +++ /dev/null @@ -1,582 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-295.71.ebuild,v 1.1 2012/08/08 18:23:34 cardoe Exp $ - -EAPI="2" - -inherit eutils unpacker multilib portability versionator linux-mod flag-o-matic nvidia-driver - -X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}" -X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}" -AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}" - -DESCRIPTION="NVIDIA X11 driver and GLX libraries with hardened patches" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="http://us.download.nvidia.com/XFree86/Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run" - -LICENSE="NVIDIA" -SLOT="0" -KEYWORDS="~amd64" -IUSE="acpi multilib kernel_FreeBSD kernel_linux +tools" -RESTRICT="strip" -EMULTILIB_PKG="true" - -COMMON="<x11-base/xorg-server-1.12.99 - kernel_linux? ( >=sys-libs/glibc-2.6.1 ) - multilib? ( app-emulation/emul-linux-x86-xlibs ) - >=app-admin/eselect-opengl-1.0.9 - app-admin/eselect-opencl" -DEPEND="${COMMON} - kernel_linux? ( virtual/linux-sources )" -RDEPEND="${COMMON} - x11-libs/libXvMC - acpi? ( sys-power/acpid ) - tools? ( - dev-libs/atk - dev-libs/glib - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXext - x11-libs/pango - )" -PDEPEND=">=x11-libs/libvdpau-0.3-r1" - -QA_TEXTRELS_x86=" - usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0 - usr/lib/libXvMCNVIDIA.so.${PV} - usr/lib/libcuda.so.${PV} - usr/lib/libnvcuvid.so.${PV} - usr/lib/libnvidia-cfg.so.${PV} - usr/lib/libnvidia-compiler.so.${PV} - usr/lib/libnvidia-glcore.so.${PV} - usr/lib/libnvidia-ml.so.${PV} - usr/lib/libvdpau_nvidia.so.${PV} - usr/lib/opengl/nvidia/extensions/libglx.so.${PV} - usr/lib/opengl/nvidia/lib/libGL.so.${PV} - usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV} - usr/lib/xorg/modules/drivers/nvidia_drv.so" - -QA_TEXTRELS_x86_fbsd="boot/modules/nvidia.ko - usr/lib/opengl/nvidia/lib/libGL.so.1 - usr/lib/libnvidia-glcore.so.1 - usr/lib/libvdpau_nvidia.so.1 - usr/lib/libnvidia-cfg.so.1 - usr/lib/opengl/nvidia/extensions/libglx.so.1 - usr/lib/xorg/modules/drivers/nvidia_drv.so" - -QA_TEXTRELS_amd64="usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV} - usr/lib32/libnvidia-glcore.so.${PV} - usr/lib32/libvdpau_nvidia.so.${PV} - usr/lib32/opengl/nvidia/lib/libGL.so.${PV} - usr/lib32/libcuda.so.${PV} - usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0 - usr/lib32/libnvidia-compiler.so.${PV}" - -QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV} - usr/lib/libnvidia-glcore.so.${PV} - usr/lib/opengl/nvidia/extensions/libglx.so.${PV} - usr/lib64/libXvMCNVIDIA.so.${PV} - usr/lib/libXvMCNVIDIA.a:NVXVMC.o - usr/lib/libvdpau_nvidia.so.${PV} - usr/lib/libnvidia-compiler.so.${PV} - usr/lib/libcuda.so.${PV} - usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0" - -QA_EXECSTACK_amd64="usr/lib32/libnvidia-glcore.so.${PV} - usr/lib32/opengl/nvidia/lib/libGL.so.${PV} - usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV} - usr/lib32/libvdpau_nvidia.so.${PV} - usr/lib32/libcuda.so.${PV} - usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0 - usr/lib32/libnvidia-compiler.so.${PV} - usr/lib64/libXvMCNVIDIA.a:NVXVMC.o - usr/lib64/libnvidia-cfg.so.${PV} - usr/lib64/libnvidia-ml.so.${PV} - usr/lib64/libvdpau_nvidia.so.${PV} - usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV} - usr/lib64/opengl/nvidia/lib/libGL.so.${PV} - usr/lib64/libnvidia-glcore.so.${PV} - usr/lib64/opengl/nvidia/extensions/libglx.so.${PV} - usr/lib64/libXvMCNVIDIA.so.${PV} - usr/lib64/libcuda.so.${PV} - usr/lib64/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0 - usr/lib64/libnvidia-compiler.so.${PV} - usr/lib64/xorg/modules/drivers/nvidia_drv.so - opt/bin/nvidia-smi - opt/bin/nvidia-xconfig - opt/bin/nvidia-debugdump - opt/bin/nvidia-settings" - -QA_WX_LOAD_x86="usr/lib/libnvidia-glcore.so.${PV} - usr/lib/opengl/nvidia/lib/libGL.so.${PV} - usr/lib/opengl/nvidia/extensions/libglx.so.${PV} - usr/lib/libXvMCNVIDIA.a - usr/lib64/libXvMCNVIDIA.so.${PV}" - -QA_WX_LOAD_amd64="usr/lib32/opengl/nvidia/lib/libGL.so.${PV} - usr/lib32/libnvidia-glcore.so.${PV} - usr/lib64/opengl/nvidia/lib/libGL.so.${PV} - usr/lib64/libnvidia-glcore.so.${PV} - usr/lib64/opengl/nvidia/extensions/libglx.so.${PV} - usr/lib64/libXvMCNVIDIA.so.${PV}" - -QA_SONAME_x86="usr/lib/libnvidia-compiler.so.${PV}" - -QA_SONAME_amd64="usr/lib64/libnvidia-compiler.so.${PV} - usr/lib32/libnvidia-compiler.so.${PV}" - -QA_DT_HASH_amd64="usr/lib32/libcuda.so.${PV} - usr/lib32/opengl/nvidia/lib/libGL.so.${PV} - usr/lib32/libnvidia-glcore.so.${PV} - usr/lib32/opengl/nvidia/lib/libnvidia-tls.so.${PV} - usr/lib32/libvdpau_nvidia.so.${PV} - usr/lib32/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0 - usr/lib32/libnvidia-compiler.so.${PV} - usr/lib64/libXvMCNVIDIA.so.${PV} - usr/lib64/libcuda.so.${PV} - usr/lib64/libnvidia-cfg.so.${PV} - usr/lib64/libnvidia-glcore.so.${PV} - usr/lib64/libnvidia-ml.so.${PV} - usr/lib64/opengl/nvidia/lib/libGL.so.${PV} - usr/lib64/opengl/nvidia/lib/libnvidia-tls.so.${PV} - usr/lib64/opengl/nvidia/extensions/libglx.so.${PV} - usr/lib64/xorg/modules/drivers/nvidia_drv.so - usr/lib64/libvdpau_nvidia.so.${PV} - usr/lib64/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0 - usr/lib64/libnvidia-compiler.so.${PV} - usr/lib64/libnvcuvid.so.${PV} - opt/bin/nvidia-smi - opt/bin/nvidia-xconfig - opt/bin/nvidia-debugdump - opt/bin/nvidia-settings" - -QA_DT_HASH_x86="usr/lib/libcuda.so.${PV} - usr/lib/libnvidia-cfg.so.${PV} - usr/lib/libnvidia-glcore.so.${PV} - usr/lib/libnvidia-ml.so.${PV} - usr/lib/opengl/nvidia/lib/libGL.so.${PV} - usr/lib/opengl/nvidia/lib/libnvidia-tls.so.${PV} - usr/lib/opengl/nvidia/extensions/libglx.so.${PV} - usr/lib/xorg/modules/drivers/nvidia_drv.so - usr/lib/libXvMCNVIDIA.so.${PV} - usr/lib/libvdpau_nvidia.so.${PV} - usr/lib/OpenCL/vendors/nvidia/libOpenCL.so.1.0.0 - usr/lib/libnvidia-compiler.so.${PV} - usr/lib/libnvcuvid.so.${PV} - opt/bin/nvidia-smi - opt/bin/nvidia-xconfig - opt/bin/nvidia-debugdump - opt/bin/nvidia-settings" - -S=${WORKDIR}/ - -mtrr_check() { - ebegin "Checking for MTRR support" - linux_chkconfig_present MTRR - eend $? - - if [[ $? -ne 0 ]] ; then - eerror "Please enable MTRR support in your kernel config, found at:" - eerror - eerror " Processor type and features" - eerror " [*] MTRR (Memory Type Range Register) support" - eerror - eerror "and recompile your kernel ..." - die "MTRR support not detected!" - fi -} - -lockdep_check() { - if linux_chkconfig_present LOCKDEP; then - eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel." - eerror "Unfortunately, this option exports the symbol " - eerror "'lockdep_init_map' as GPL-only which will prevent " - eerror "${P} from compiling." - eerror "Please make sure the following options have been unset:" - eerror - eerror " Kernel hacking --->" - eerror " [ ] Lock debugging: detect incorrect freeing of live locks" - eerror " [ ] Lock debugging: prove locking correctness" - eerror " [ ] Lock usage statistics" - eerror "in 'menuconfig'" - die "LOCKDEP enabled" - fi -} - -pkg_setup() { - # try to turn off distcc and ccache for people that have a problem with it - export DISTCC_DISABLE=1 - export CCACHE_DISABLE=1 - - if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then - eerror "This ebuild doesn't currently support changing your default abi." - die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}" - fi - - if use kernel_linux; then - linux-mod_pkg_setup - MODULE_NAMES="nvidia(video:${S}/kernel)" - BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \ - SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC)" - # linux-mod_src_compile calls set_arch_to_kernel, which - # sets the ARCH to x86 but NVIDIA's wrapping Makefile - # expects x86_64 or i386 and then converts it to x86 - # later on in the build process - BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')" - mtrr_check - lockdep_check - fi - - # On BSD userland it wants real make command - use userland_BSD && MAKE="$(get_bmake)" - - export _POSIX2_VERSION="199209" - - # Since Nvidia ships 3 different series of drivers, we need to give the user - # some kind of guidance as to what version they should install. This tries - # to point the user in the right direction but can't be perfect. check - # nvidia-driver.eclass - nvidia-driver-check-warning - - # set variables to where files are in the package structure - if use kernel_FreeBSD; then - use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}" - use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}" - NV_DOC="${S}/doc" - NV_EXEC="${S}/obj" - NV_LIB="${S}/obj" - NV_SRC="${S}/src" - NV_MAN="${S}/x11/man" - NV_X11="${S}/obj" - NV_X11_DRV="${NV_X11}" - NV_X11_EXT="${NV_X11}" - NV_SOVER=1 - elif use kernel_linux; then - NV_DOC="${S}" - NV_EXEC="${S}" - NV_LIB="${S}" - NV_SRC="${S}/kernel" - NV_MAN="${S}" - NV_X11="${S}" - NV_X11_DRV="${NV_X11}" - NV_X11_EXT="${NV_X11}" - NV_SOVER=${PV} - else - die "Could not determine proper NVIDIA package" - fi -} - -src_unpack() { - if use kernel_linux && kernel_is lt 2 6 7; then - echo - ewarn "Your kernel version is ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" - ewarn "This is not officially supported for ${P}. It is likely you" - ewarn "will not be able to compile or use the kernel module." - ewarn "It is recommended that you upgrade your kernel to a version >= 2.6.7" - echo - ewarn "DO NOT file bug reports for kernel versions less than 2.6.7 as they will be ignored." - fi - - if ! use kernel_FreeBSD; then - cd "${S}" - unpack_makeself - else - unpack ${A} - fi -} - -src_prepare() { - # Please add a brief description for every added patch - use kernel_FreeBSD && cd doc - - if use kernel_linux; then - # Quiet down warnings the user does not need to see - sed -i \ - -e 's:-Wsign-compare::g' \ - "${NV_SRC}"/Makefile.kbuild - - # If greater than 2.6.5 use M= instead of SUBDIR= - convert_to_m "${NV_SRC}"/Makefile.kbuild - fi - cat <<- EOF > "${S}"/nvidia.icd - /usr/$(get_libdir)/libcuda.so - EOF - - # Allow user patches so they can support RC kernels and whatever else - epatch_user - epatch "${FILESDIR}"/nvidia-2.6.38-hardened.diff - epatch "${FILESDIR}"/nvidia-drivers-275.19-pax-const.patch -} - -src_compile() { - # This is already the default on Linux, as there's no toplevel Makefile, but - # on FreeBSD there's one and triggers the kernel module build, as we install - # it by itself, pass this. - - cd "${NV_SRC}" - if use kernel_FreeBSD; then - MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \ - LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die - elif use kernel_linux; then - linux-mod_src_compile - fi -} - -src_install() { - if use kernel_linux; then - linux-mod_src_install - - VIDEOGROUP="$(egetent group video | cut -d ':' -f 3)" - if [ -z "$VIDEOGROUP" ]; then - eerror "Failed to determine the video group gid." - die "Failed to determine the video group gid." - fi - - # Add the aliases - [ -f "${FILESDIR}/nvidia-169.07" ] || die "nvidia missing in FILESDIR" - sed -e 's:PACKAGE:'${PF}':g' \ - -e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-169.07 > \ - "${WORKDIR}"/nvidia - insinto /etc/modprobe.d - newins "${WORKDIR}"/nvidia nvidia.conf || die - - # Ensures that our device nodes are created when not using X - exeinto /lib/udev - doexe "${FILESDIR}"/nvidia-udev.sh - - insinto /lib/udev/rules.d - newins "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules - elif use kernel_FreeBSD; then - if use x86-fbsd; then - insinto /boot/modules - doins "${S}/src/nvidia.kld" || die - fi - - exeinto /boot/modules - doexe "${S}/src/nvidia.ko" || die - fi - - # NVIDIA kernel <-> userspace driver config lib - dolib.so ${NV_LIB}/libnvidia-cfg.so.${NV_SOVER} || \ - die "failed to install libnvidia-cfg" - dosym libnvidia-cfg.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvidia-cfg.so.1 || \ - die "failed to create libnvidia-cfg.so symlink" - dosym libnvidia-cfg.so.1 \ - /usr/$(get_libdir)/libnvidia-cfg.so || \ - die "failed to create libnvidia-cfg.so symlink" - - if use kernel_linux; then - # NVIDIA monitoring library - dolib.so ${NV_LIB}/libnvidia-ml.so.${NV_SOVER} || \ - die "failed to install libnvidia-ml" - dosym libnvidia-ml.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvidia-ml.so.1 || \ - die "failed to create libnvidia-ml.so symlink" - dosym libnvidia-ml.so.1 \ - /usr/$(get_libdir)/libnvidia-ml.so || \ - die "failed to create libnvidia-ml.so symlink" - - # NVIDIA video decode <-> CUDA - dolib.so ${NV_LIB}/libnvcuvid.so.${NV_SOVER} || \ - die "failed to install libnvcuvid.so" - dosym libnvcuvid.so.${NV_SOVER} \ - /usr/$(get_libdir)/libnvcuvid.so.1 || \ - die "failed to create libnvcuvid.so symlink" - dosym libnvcuvid.so.1 \ - /usr/$(get_libdir)/libnvcuvid.so || \ - die "failed to create libnvcuvid.so symlink" - fi - - # Xorg DDX driver - insinto /usr/$(get_libdir)/xorg/modules/drivers - doins ${NV_X11_DRV}/nvidia_drv.so || die "failed to install nvidia_drv.so" - - # Xorg GLX driver - insinto /usr/$(get_libdir)/opengl/nvidia/extensions - doins ${NV_X11_EXT}/libglx.so.${NV_SOVER} || \ - die "failed to install libglx.so" - dosym libglx.so.${NV_SOVER} \ - /usr/$(get_libdir)/opengl/nvidia/extensions/libglx.so || \ - die "failed to create libglx.so symlink" - - # XvMC driver - dolib.a ${NV_X11}/libXvMCNVIDIA.a || \ - die "failed to install libXvMCNVIDIA.so" - dolib.so ${NV_X11}/libXvMCNVIDIA.so.${NV_SOVER} || \ - die "failed to install libXvMCNVIDIA.so" - dosym libXvMCNVIDIA.so.${NV_SOVER} \ - /usr/$(get_libdir)/libXvMCNVIDIA.so.1 || \ - die "failed to create libXvMCNVIDIA.so symlink" - dosym libXvMCNVIDIA.so.1 /usr/$(get_libdir)/libXvMCNVIDIA.so || \ - die "failed to create libXvMCNVIDIA.so symlink" - dosym libXvMCNVIDIA.so.${NV_SOVER} \ - /usr/$(get_libdir)/libXvMCNVIDIA_dynamic.so.1 || \ - die "failed to create libXvMCNVIDIA_dynamic.so symlink" - - # OpenCL ICD for NVIDIA - if use kernel_linux; then - insinto /etc/OpenCL/vendors - doins nvidia.icd - fi - - # Documentation - dohtml ${NV_DOC}/html/* - if use kernel_FreeBSD; then - dodoc "${NV_DOC}/README" - doman "${NV_MAN}/nvidia-xconfig.1" - doman "${NV_MAN}/nvidia-settings.1" - else - # Docs - newdoc "${NV_DOC}/README.txt" README - dodoc "${NV_DOC}/NVIDIA_Changelog" - doman "${NV_MAN}/nvidia-smi.1.gz" - doman "${NV_MAN}/nvidia-xconfig.1.gz" - doman "${NV_MAN}/nvidia-settings.1.gz" - fi - - # Helper Apps - exeinto /opt/bin/ - doexe ${NV_EXEC}/nvidia-xconfig || die - use kernel_linux && { doexe ${NV_EXEC}/nvidia-debugdump || die ; } - if use tools; then - doexe ${NV_EXEC}/nvidia-settings || die - fi - doexe ${NV_EXEC}/nvidia-bug-report.sh || die - if use kernel_linux; then - doexe ${NV_EXEC}/nvidia-smi || die - fi - - # Desktop entries for nvidia-settings - if use tools && use kernel_linux ; then - sed -e 's:__UTILS_PATH__:/opt/bin:' \ - -e 's:__PIXMAP_PATH__:/usr/share/pixmaps:' \ - -i "${NV_EXEC}/nvidia-settings.desktop" - newmenu ${NV_EXEC}/nvidia-settings.desktop nvidia-settings-opt.desktop - fi - - doicon ${NV_EXEC}/nvidia-settings.png - - if has_multilib_profile && use multilib ; then - local OABI=${ABI} - for ABI in $(get_install_abis) ; do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - is_final_abi || die "failed to iterate through all ABIs" -} - -# Install nvidia library: -# the first parameter is the place where to install it -# the second parameter is the base name of the library -# the third parameter is the provided soversion -donvidia() { - dodir $1 - exeinto $1 - - libname=$(basename $2) - - doexe $2.$3 || die "failed to install $2" - dosym ${libname}.$3 $1/${libname} || die "failed to symlink $2" - [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 -} - -src_install-libs() { - local inslibdir=$(get_libdir) - local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" - local CL_ROOT=/usr/${inslibdir}/OpenCL/vendors/nvidia - local libdir= sover= - - if use kernel_linux; then - if has_multilib_profile && [[ ${ABI} == "x86" ]] ; then - libdir=32 - else - libdir=. - fi - sover=${PV} - else - libdir=obj - # on FreeBSD it has just .1 suffix - sover=1 - fi - - # The GLX libraries - donvidia ${NV_ROOT}/lib ${libdir}/libGL.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libnvidia-glcore.so ${sover} - if use kernel_FreeBSD; then - donvidia ${NV_ROOT}/lib ${libdir}/libnvidia-tls.so ${sover} - else - donvidia ${NV_ROOT}/lib ${libdir}/tls/libnvidia-tls.so ${sover} - fi - - # VDPAU - donvidia /usr/${inslibdir} ${libdir}/libvdpau_nvidia.so ${sover} - - # CUDA & OpenCL - if use kernel_linux; then - donvidia /usr/${inslibdir} ${libdir}/libcuda.so ${sover} - donvidia /usr/${inslibdir} ${libdir}/libnvidia-compiler.so ${sover} - donvidia ${CL_ROOT} ${libdir}/libOpenCL.so 1.0.0 - #dosym libOpenCL.so.1 ${CL_ROOT}/libOpenCL.so - fi -} - -pkg_preinst() { - use kernel_linux && linux-mod_pkg_preinst - - # Clean the dynamic libGL stuff's home to ensure - # we dont have stale libs floating around - if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then - rm -rf "${ROOT}"/usr/lib/opengl/nvidia/* - fi - # Make sure we nuke the old nvidia-glx's env.d file - if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then - rm -f "${ROOT}"/etc/env.d/09nvidia - fi -} - -pkg_postinst() { - use kernel_linux && linux-mod_pkg_postinst - - # Switch to the nvidia implementation - "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia - "${ROOT}"/usr/bin/eselect opencl set --use-old nvidia - - elog "You must be in the video group to use the NVIDIA device" - elog "For more info, read the docs at" - elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6" - elog - elog "This ebuild installs a kernel module and X driver. Both must" - elog "match explicitly in their version. This means, if you restart" - elog "X, you must modprobe -r nvidia before starting it back up" - elog - elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\"" - elog - elog "To use the NVIDIA CUDA/OpenCL, run \"eselect opencl set nvidia\"" - elog - elog "NVIDIA has requested that any bug reports submitted have the" - elog "output of /opt/bin/nvidia-bug-report.sh included." - elog - if ! use tools; then - elog "USE=tools controls whether the nvidia-settings application" - elog "is installed. If you would like to use it, enable that" - elog "flag and re-emerge this ebuild. Optionally you can install" - elog "media-video/nvidia-settings" - fi -} - -pkg_prerm() { - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} - -pkg_postrm() { - use kernel_linux && linux-mod_pkg_postrm - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} |