From: Chris Gianelloni Date: Fri, 10 Nov 2006 17:47:35 +0000 (+0000) Subject: Removing the 1.0-9626 driver, since it has been known to cause a black screen at... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7923e65f161139763bb33296384cadd80dadaf8b;p=gentoo.git Removing the 1.0-9626 driver, since it has been known to cause a black screen at X startup and is superceded by the 9629 driver. Package-Manager: portage-2.1.2_rc1-r4 --- diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 1148239fe748..bd52c6fbef0a 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -1,11 +1,10 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f53409dfe511636d92a339edb4c765 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39 MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca files/09nvidia 61 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39 files/09nvidia 61 -AUX 1.0.9626/NVIDIA-1.0.9626-i2c.diff 530 RMD160 b63e7b660fcbea4a89c75b2e1dd4f6a29d2bccab SHA1 44e6e57bbf7a4cbcc9ee9056deaf15b74546ec55 SHA256 f1033187c3f92c555c991ab7ea1b93e643df9358ef0e97492da0b79c96b8f1c6 -MD5 63fdbaa357289ab2db41aabe79cd0aba files/1.0.9626/NVIDIA-1.0.9626-i2c.diff 530 -RMD160 b63e7b660fcbea4a89c75b2e1dd4f6a29d2bccab files/1.0.9626/NVIDIA-1.0.9626-i2c.diff 530 -SHA256 f1033187c3f92c555c991ab7ea1b93e643df9358ef0e97492da0b79c96b8f1c6 files/1.0.9626/NVIDIA-1.0.9626-i2c.diff 530 AUX NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c SHA1 eef9bcae32d4e00133b205e27ce766488d5c6cdb SHA256 0007f3d962edb87da4788ce58869679c1b10f28223a6bf1c23696fede57305da MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/NVIDIA_glx-defines.patch 437 RMD160 7cc38de0663c51d9e3718f02035a940a5d31e53c files/NVIDIA_glx-defines.patch 437 @@ -32,17 +31,14 @@ RMD160 e53af79cf9a56377908834bdbe07fa3c99a5530e files/nvidia 704 SHA256 6ac22481314de823ec31e60663521f318c7eceec75162c11cb97260db6ee0fe2 files/nvidia 704 DIST NVIDIA-FreeBSD-x86-1.0-8774.tar.gz 9449433 RMD160 f9e9a2f370bd19e5ae723e21dfaadf9328bfcdff SHA1 e9e3635824815061fd01b4ece43f5ecd8f0a3424 SHA256 a5156d4da19fa544172ec9eca4e612c6b48c7d9f932cebf695e7206343ed9a07 DIST NVIDIA-FreeBSD-x86-1.0-8776.tar.gz 9448963 RMD160 d646e511978ac77fddb6600eabdfc1ea32146e00 SHA1 ef27e21c6117ba912c8c4351f4e89098d6672296 SHA256 404f25862031d8f3036de33d2a0fafc3c54821a9a08832c1c1616c145d93baa5 -DIST NVIDIA-FreeBSD-x86-1.0-9626.tar.gz 9731946 RMD160 9c0f9baafd921bab45b015b2553aed6b4a1fcdeb SHA1 321647502a973aa447074c0f05cd289386fd601f SHA256 98e9a71b8264436f3100bd145993ee710a193db4e1aae1be1b3bc9213f7f4b2b DIST NVIDIA-FreeBSD-x86-1.0-9629.tar.gz 9664826 RMD160 4fbde38f91a517ae6a27331859d896f129e3ae51 SHA1 06a1fff3daaa77b34e43ac09243405361a219bad SHA256 8d8e0977150871fcc45a5607df823970738da1f9ec1ec4c8115790b38cea9d79 DIST NVIDIA-FreeBSD-x86-1.0-9742.tar.gz 11161961 RMD160 1fe9fa3f561fac1883e295eee68fd1b4065b8898 SHA1 59e1c2aca45a777fa52d3c84bdf6b791791b4ea2 SHA256 398d742cccb450d2c02e0bb4f9f91ec0daeee6546f1327ec6477c80d4b9fa287 DIST NVIDIA-Linux-x86-1.0-8774-pkg0.run 6479697 RMD160 ada4a46bd70d11f1c337a3c4be8c3f860591562c SHA1 0a2e063da4bf9ccee23a30033280d660129aebe3 SHA256 79d86b5cc43e230584ffb93a7bc7e83d29ee8a7b3c376fbba30cf0b7dd7e9b01 DIST NVIDIA-Linux-x86-1.0-8776-pkg0.run 6479231 RMD160 296dcc76c43fd65105f8d0c6f99295ee983b8872 SHA1 362902983e11e1b372a102359c6057ebb5aa7ef6 SHA256 0b25f9e407ea513cac8d600054d2dc28ca2e407caa535510210ad9fa5f45e8dc -DIST NVIDIA-Linux-x86-1.0-9626-pkg0.run 6630792 RMD160 5d1fbbbde5a5bc5331b1cf8900c69f0b65bb23d8 SHA1 a50e04f2db7a382e60b98330d69b406e8328e436 SHA256 da92ca07761719d12a5b0eda428852f83ed7dd0cfd3f6a2aef44de8df09453ed DIST NVIDIA-Linux-x86-1.0-9629-pkg0.run 6583110 RMD160 29181862d735990f8b9164967dad59e08328f323 SHA1 c958910180567b3662a206b6c3d37b36e82321b2 SHA256 a2f3773ad296bb307cb7586bbf9301da3c6e92747ebe2f857dc2a51e4815a612 DIST NVIDIA-Linux-x86-1.0-9742-pkg0.run 7715637 RMD160 8b7eba8dff97b4230b1031d65ed99ec3e37adeeb SHA1 c1787fe77785e7a5931bb0cf387f4a235580bb63 SHA256 e123bc78281f3c07f0b39e35430dee855b6ae7baf00ea956119fa0dae12be8fa DIST NVIDIA-Linux-x86_64-1.0-8774-pkg2.run 9982211 RMD160 c4b60dce917fe6720b5fc2a848a195c0174b73c7 SHA1 777c5fec111190eba15b6ffcb50f3bcf24ae8191 SHA256 ffab97398bc034523ee115476d6c8b85fda2c53c18040f1d6e0971278c6f9214 DIST NVIDIA-Linux-x86_64-1.0-8776-pkg2.run 9982646 RMD160 5cba53392aa0fd27231d01883679e1a1dba7ee34 SHA1 2a6297b89f0586192f806a18271c5e58de4eed0b SHA256 6fc8dedf782fdfe408dc0196531c301bb3bafac6878520537807118f3a2f9384 -DIST NVIDIA-Linux-x86_64-1.0-9626-pkg2.run 10296145 RMD160 2bdbe5aff2ab7afebece102db62233748bd302e6 SHA1 778089b3d34bdcf763f0e6e58767816f62378214 SHA256 56e8bc38e8966fe7e7046071409a27f02af909432b54f82b2e8079c1d6c3cc5d DIST NVIDIA-Linux-x86_64-1.0-9629-pkg2.run 10235191 RMD160 38ee873f59ddc1299621dcccc7cf1c43da50dec9 SHA1 92d42f9854f35a40b8fd04e567c72740312718e1 SHA256 e8fcee3beb71329ed1e5fd700d80ba60264ff17e84e39871fbc6e20cdf8620c6 DIST NVIDIA-Linux-x86_64-1.0-9742-pkg2.run 11715309 RMD160 f59dad063810e87ed79699a32419318a53cb6aee SHA1 a3db0b69cffd4d8847aa7a9c5abdf79c292901eb SHA256 c35f9bcfd0793f7c1b29077be276e4d4a2e69c4ea90ca60134c118350f2ef5b9 EBUILD nvidia-drivers-1.0.8774.ebuild 12566 RMD160 c5040716ccbf3350cd3b3ba51b147846e443d456 SHA1 03442d6a50279dc1a53d235502111f722b63096a SHA256 eda4d56d0cfabd8fd07d66eed352be4ea3ec81ee45b36cff6e72b62fbc38ed98 @@ -53,10 +49,6 @@ EBUILD nvidia-drivers-1.0.8776.ebuild 12562 RMD160 5ab1084c0b86c667c0956663ea954 MD5 198f62ad7c5c2f290be646e73c532cde nvidia-drivers-1.0.8776.ebuild 12562 RMD160 5ab1084c0b86c667c0956663ea95423429529e76 nvidia-drivers-1.0.8776.ebuild 12562 SHA256 cfe19b9c7fe030f38fd57bed73a0f0a469386ec57b9db7155859fa7990b6d91f nvidia-drivers-1.0.8776.ebuild 12562 -EBUILD nvidia-drivers-1.0.9626.ebuild 12686 RMD160 1fff51ae89d2356aa7845f806e045d9526c05e0a SHA1 579e7df774ceabcb1d9d38b13576bf4610daba84 SHA256 528e077072367485752ca6df1acb68a23b81bea6a02e700eccec0c3e3c7222d7 -MD5 1ebd3595e4ff6ca7f806ae132ad1f589 nvidia-drivers-1.0.9626.ebuild 12686 -RMD160 1fff51ae89d2356aa7845f806e045d9526c05e0a nvidia-drivers-1.0.9626.ebuild 12686 -SHA256 528e077072367485752ca6df1acb68a23b81bea6a02e700eccec0c3e3c7222d7 nvidia-drivers-1.0.9626.ebuild 12686 EBUILD nvidia-drivers-1.0.9629.ebuild 12389 RMD160 8f7fe59cd8669038f70da4c6ae545200572c0e06 SHA1 6c6e4e6742be34e2451a403794a328712ca74830 SHA256 838eb49e909af6b08f5bde557a80b7861517d60fb1ba7aab1bec4fe14d237391 MD5 7701ce569a9c8a87a19da12126037a30 nvidia-drivers-1.0.9629.ebuild 12389 RMD160 8f7fe59cd8669038f70da4c6ae545200572c0e06 nvidia-drivers-1.0.9629.ebuild 12389 @@ -65,10 +57,10 @@ EBUILD nvidia-drivers-1.0.9742.ebuild 12399 RMD160 c7d5a70384f5c3d1a1dbcecc28ad8 MD5 fcbb4b5800ac4c25abb183897d0b3310 nvidia-drivers-1.0.9742.ebuild 12399 RMD160 c7d5a70384f5c3d1a1dbcecc28ad81d1456fe47d nvidia-drivers-1.0.9742.ebuild 12399 SHA256 07f50e842f9ac67fbfd169327674e9d2b540228dc3b590c8edf3f74718f11d87 nvidia-drivers-1.0.9742.ebuild 12399 -MISC ChangeLog 6640 RMD160 d3a1dff66ae608241afcf8da70e54e4ba4c2f99a SHA1 0ce10c12b4a1363c44e2cbdbacfbd49cc3ce86c6 SHA256 75eb4bf1eb60b47d03a237bbdffe60fb380af7e57b94ba8bebe48a73b97a0d29 -MD5 224de0f56a65c82bb6af074e77e764e5 ChangeLog 6640 -RMD160 d3a1dff66ae608241afcf8da70e54e4ba4c2f99a ChangeLog 6640 -SHA256 75eb4bf1eb60b47d03a237bbdffe60fb380af7e57b94ba8bebe48a73b97a0d29 ChangeLog 6640 +MISC ChangeLog 6905 RMD160 a842218ffd424e2edeccc5b670b779828e00aec9 SHA1 8c7417230c636d4173d7e371f5f29e576ba0e5a4 SHA256 d2f96247a74ffceabf3f4e45bb060cdfa7f93dbf0343af65e3dc28d1f495a597 +MD5 41379b361ea32b58a6ed62c47e49fd14 ChangeLog 6905 +RMD160 a842218ffd424e2edeccc5b670b779828e00aec9 ChangeLog 6905 +SHA256 d2f96247a74ffceabf3f4e45bb060cdfa7f93dbf0343af65e3dc28d1f495a597 ChangeLog 6905 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302 @@ -79,12 +71,16 @@ SHA256 ecdefa40d6421548fe01e3be584def65e7680204c39a50842b9aad7f81c82def files/di MD5 352fa2d75a4a3f1244165817cdbf61d4 files/digest-nvidia-drivers-1.0.8776 867 RMD160 073fc276016fc837371f3c321bd76786bc68ca19 files/digest-nvidia-drivers-1.0.8776 867 SHA256 9a2c001f4a7d6b6461ae0ed151c958442f1bc15f7c4515f499d876a503d41f92 files/digest-nvidia-drivers-1.0.8776 867 -MD5 71d7cb49f56ba1d4444bbb2724493431 files/digest-nvidia-drivers-1.0.9626 870 -RMD160 24f92797719b924513859aa924f98d3efe3bcb85 files/digest-nvidia-drivers-1.0.9626 870 -SHA256 7795cbdb9e80c0b4634511a760414667239d98ff1b4ee63ec67898ba3f507a7e files/digest-nvidia-drivers-1.0.9626 870 MD5 e22ba3cecde9f7c5b6f5bbea87b34954 files/digest-nvidia-drivers-1.0.9629 870 RMD160 bd8ebb0f64cf1e6326be4c9f5081925797496adf files/digest-nvidia-drivers-1.0.9629 870 SHA256 a1bba83f45a5d37c5e48e7bd4d88c5d920b2bb57d9f244ee2616caabb705c280 files/digest-nvidia-drivers-1.0.9629 870 MD5 64c118e7466e2dbefe2855603cd2e025 files/digest-nvidia-drivers-1.0.9742 873 RMD160 b1cf6748ec6d8209ad98f9f72cf4dc8151115dc4 files/digest-nvidia-drivers-1.0.9742 873 SHA256 8dd84c7a6735999dd6c18040ed7dce2e29c6a5e6eef94ae145ecee72fee71c77 files/digest-nvidia-drivers-1.0.9742 873 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFVL5fkT4lNIS36YERApnFAJ92eulYvpYRo5kOuDuEv3GDtr6GgQCfcLsg +jduwnC1mE5t+cpuQfT7vKdk= +=J6OG +-----END PGP SIGNATURE----- diff --git a/x11-drivers/nvidia-drivers/files/1.0.9626/NVIDIA-1.0.9626-i2c.diff b/x11-drivers/nvidia-drivers/files/1.0.9626/NVIDIA-1.0.9626-i2c.diff deleted file mode 100644 index cae4581af6bf..000000000000 --- a/x11-drivers/nvidia-drivers/files/1.0.9626/NVIDIA-1.0.9626-i2c.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff -ru usr/src/nv/nv-i2c.c usr/src/nv.NOSMBUS/nv-i2c.c ---- usr/src/nv/nv-i2c.c 2006-09-15 01:10:17.000000000 +0200 -+++ usr/src/nv.NOSMBUS/nv-i2c.c 2006-09-22 21:56:17.259789750 +0200 -@@ -138,11 +138,7 @@ - - static u32 nv_i2c_algo_functionality(struct i2c_adapter *adap) - { -- return (I2C_FUNC_I2C | -- I2C_FUNC_SMBUS_QUICK | -- I2C_FUNC_SMBUS_BYTE | -- I2C_FUNC_SMBUS_BYTE_DATA | -- I2C_FUNC_SMBUS_WORD_DATA); -+ return I2C_FUNC_I2C; - } - - static struct i2c_algorithm nv_i2c_algo = { diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9626 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9626 deleted file mode 100644 index 3b25840ed7af..000000000000 --- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9626 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 28cae98f6b3e6d8b71c731a40f0f9f25 NVIDIA-FreeBSD-x86-1.0-9626.tar.gz 9731946 -RMD160 9c0f9baafd921bab45b015b2553aed6b4a1fcdeb NVIDIA-FreeBSD-x86-1.0-9626.tar.gz 9731946 -SHA256 98e9a71b8264436f3100bd145993ee710a193db4e1aae1be1b3bc9213f7f4b2b NVIDIA-FreeBSD-x86-1.0-9626.tar.gz 9731946 -MD5 69ee44874b924742f1f3187f299355b2 NVIDIA-Linux-x86-1.0-9626-pkg0.run 6630792 -RMD160 5d1fbbbde5a5bc5331b1cf8900c69f0b65bb23d8 NVIDIA-Linux-x86-1.0-9626-pkg0.run 6630792 -SHA256 da92ca07761719d12a5b0eda428852f83ed7dd0cfd3f6a2aef44de8df09453ed NVIDIA-Linux-x86-1.0-9626-pkg0.run 6630792 -MD5 11d39ec95f04b40c5559c4f190db6d85 NVIDIA-Linux-x86_64-1.0-9626-pkg2.run 10296145 -RMD160 2bdbe5aff2ab7afebece102db62233748bd302e6 NVIDIA-Linux-x86_64-1.0-9626-pkg2.run 10296145 -SHA256 56e8bc38e8966fe7e7046071409a27f02af909432b54f82b2e8079c1d6c3cc5d NVIDIA-Linux-x86_64-1.0-9626-pkg2.run 10296145 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9626.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9626.ebuild deleted file mode 100644 index db53eba2f673..000000000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9626.ebuild +++ /dev/null @@ -1,441 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9626.ebuild,v 1.6 2006/10/20 18:47:54 wolf31o2 Exp $ - -inherit eutils multilib versionator linux-mod - -NV_V="${PV/1.0./1.0-}" -X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}" -X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${NV_V}" - -DESCRIPTION="NVIDIA X11 driver and GLX libraries" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="x86? ( ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-pkg0.run ) - amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-pkg2.run ) - x86-fbsd? ( http://download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )" - -LICENSE="NVIDIA" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="dlloader" -RESTRICT="nostrip multilib-pkg-force" - -DEPEND="kernel_linux? ( virtual/linux-sources )" -RDEPEND="kernel_linux? ( virtual/modutils ) - x11-base/xorg-server - media-libs/mesa - app-admin/eselect-opengl - kernel_FreeBSD? ( !media-video/nvidia-freebsd ) - !app-emulation/emul-linux-x86-nvidia - !x11-drivers/nvidia-legacy-drivers" - -QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV} - usr/lib/opengl/nvidia/lib/libGL.so.${PV} - usr/lib/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib/opengl/nvidia/tls/libnvidia-tls.so.${PV} - usr/lib/opengl/nvidia/no-tls/libnvidia-tls.so.${PV} - usr/lib/opengl/nvidia/extensions/libglx.so" -QA_EXECSTACK_x86="usr/lib/opengl/nvidia/lib/libGL.so.${PV} - usr/lib/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib/opengl/nvidia/extensions/libglx.so" - - -QA_TEXTRELS_amd64="usr/lib64/xorg/libXvMCNVIDIA.so.${PV} - usr/lib64/opengl/nvidia/lib/libGL.so.${PV} - usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib64/opengl/nvidia/tls/libnvidia-tls.so.${PV} - usr/lib64/opengl/nvidia/no-tls/libnvidia-tls.so.${PV} - usr/lib64/opengl/nvidia/extensions/libglx.so - usr/lib32/xorg/libXvMCNVIDIA.so.${PV} - usr/lib32/opengl/nvidia/lib/libGL.so.${PV} - usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib32/opengl/nvidia/tls/libnvidia-tls.so.${PV} - usr/lib32/opengl/nvidia/no-tls/libnvidia-tls.so.${PV} - usr/lib32/opengl/nvidia/extensions/libglx.so" - -QA_EXECSTACK_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV} - usr/lib64/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib64/opengl/nvidia/extensions/libglx.so - usr/lib32/opengl/nvidia/lib/libGL.so.${PV} - usr/lib32/opengl/nvidia/lib/libGLcore.so.${PV} - usr/lib32/opengl/nvidia/extensions/libglx.so" - -export _POSIX2_VERSION="199209" - -if use x86; then - PKG_V="-pkg0" - NV_PACKAGE="${X86_NV_PACKAGE}" -elif use amd64; then - PKG_V="-pkg2" - NV_PACKAGE="${AMD64_NV_PACKAGE}" -elif use x86-fbsd; then - PKG_V="" - NV_PACKAGE="${X86_FBSD_NV_PACKAGE}" -fi - -S="${WORKDIR}/${NV_PACKAGE}${PKG_V}/usr/src/nv" - -# On BSD userland it wants real make command -MAKE="make" - -mtrr_check() { - ebegin "Checking for MTRR support" - linux_chkconfig_present MTRR - eend $? - - if [[ $? -ne 0 ]] ; then - eerror "This version needs MTRR support for most chipsets!" - 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 -} - -pkg_setup() { - 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 x86-fbsd; then - linux-mod_pkg_setup - MODULE_NAMES="nvidia(video:${S})" - BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} SYSOUT=${KV_OUT_DIR}" - mtrr_check - fi -} - -src_unpack() { - local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA-${PV}" - - if ! use x86-fbsd; then - if [[ ${KV_MINOR} -eq 6 && ${KV_PATCH} -lt 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 - fi - - if ! use x86-fbsd; then - cd ${WORKDIR} - bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only - else - unpack ${A} - fi - - # Patches go below here, add breif description - use x86-fbsd \ - && cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/doc" \ - || cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}" - # Use the correct defines to make gtkglext build work - epatch ${FILESDIR}/NVIDIA_glx-defines.patch - # Use some more sensible gl headers and make way for new glext.h - epatch ${FILESDIR}/NVIDIA_glx-glheader.patch - - if ! use x86-fbsd; then - # Zander kernel patches - # i2c patch - epatch ${NV_PATCH_PREFIX}-i2c.diff - - # Quiet down warnings the user do not need to see - sed -i \ - -e 's:-Wpointer-arith::g' \ - -e 's:-Wsign-compare::g' \ - ${S}/Makefile.kbuild - - # If you set this then it's your own fault when stuff breaks :) - [[ -n ${USE_CRAZY_OPTS} ]] && sed -i "s:-O:${CFLAGS}:" Makefile.* - - # If greater than 2.6.5 use M= instead of SUBDIR= - cd ${S}; convert_to_m Makefile.kbuild - - # Patch the Makefile to not warn about nvidia-installer -# epatch ${FILESDIR}/NVIDIA_glx-makefile.patch - - # Patch for kernel 2.6.19 from Daniel Drake - epatch ${FILESDIR}/NVIDIA_kernel-2.6.19.patch - fi -} - -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. - if use x86-fbsd; then - cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/src" - MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" - else - linux-mod_src_compile - fi -} - -src_install() { - local MLTEST=$(type dyn_unpack) - - cd ${WORKDIR}/${NV_PACKAGE}${PKG_V} - - if ! use x86-fbsd; then - linux-mod_src_install - - # Add the aliases - sed -e 's:\${PACKAGE}:'${PF}':g' ${FILESDIR}/nvidia > ${WORKDIR}/nvidia - insinto /etc/modules.d - newins ${WORKDIR}/nvidia nvidia - else - insinto /boot/modules - doins "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.kld" - - exeinto /boot/modules - doexe "${WORKDIR}/${X86_FBSD_NV_PACKAGE}/src/nvidia.ko" - fi - - if [[ "${MLTEST/set_abi}" == "${MLTEST}" ]] && has_multilib_profile ; then - local OABI=${ABI} - for ABI in $(get_install_abis) ; do - src_install-libs - done - ABI=${OABI} - unset OABI - elif use amd64 ; then - src_install-libs lib32 $(get_multilibdir) - src_install-libs lib $(get_libdir) - - rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/include - rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/extensions - else - src_install-libs - fi - - is_final_abi || return 0 - - if ! use x86-fbsd; then - # Docs, remove nvidia-settings as provided by media-video/nvidia-settings - newdoc usr/share/doc/README.txt README - dodoc usr/share/doc/Copyrights usr/share/doc/NVIDIA_Changelog - dodoc usr/share/doc/XF86Config.sample - dohtml usr/share/doc/html/* - else - dodoc doc/README doc/README.Linux doc/XF86Config.sample - fi - - # nVidia want bug reports using this script - exeinto /usr/bin - doexe usr/bin/nvidia-bug-report.sh -} - -# Install nvidia library: -# the first parameter is the place where to install it -# the second paramis the base name of the library -# the third parameter is the provided soversion -donvidia() { - dodir $1 - exeinto $1 - - libname=$(basename $2) - - doexe $2.$3 - dosym ${libname}.$3 $1/${libname} - - [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 -} - -src_install-libs() { - local pkglibdir=lib - local inslibdir=$(get_libdir) - - if [[ ${#} -eq 2 ]] ; then - pkglibdir=${1} - inslibdir=${2} - elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then - pkglibdir=lib32 - fi - - local usrpkglibdir=usr/${pkglibdir} - local libdir=usr/X11R6/${pkglibdir} - local drvdir=${libdir}/modules/drivers - local extdir=${libdir}/modules/extensions - local incdir=usr/include/GL - local sover=${PV} - local NV_ROOT="/usr/${inslibdir}/opengl/nvidia" - local NO_TLS_ROOT="${NV_ROOT}/no-tls" - local TLS_ROOT="${NV_ROOT}/tls" - local X11_LIB_DIR="/usr/${inslibdir}/xorg" - - if ! has_version x11-base/xorg-server ; then - X11_LIB_DIR="/usr/${inslibdir}" - fi - - if use x86-fbsd; then - # on FreeBSD everything is on obj/ - pkglibdir=obj - usrpkglibdir=obj - x11pkglibdir=obj - drvdir=obj - extdir=obj - - # don't ask me why the headers are there.. glxext.h is missing - incdir=doc - - # on FreeBSD it has just .1 suffix - sover=1 - fi - - # The GLX libraries - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover} - donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover} - - dodir ${NO_TLS_ROOT} - donvidia ${NO_TLS_ROOT} ${usrpkglibdir}/libnvidia-tls.so ${sover} - - if ! use x86-fbsd; then - donvidia ${TLS_ROOT} ${usrpkglibdir}/tls/libnvidia-tls.so ${sover} - fi - - if want_tls ; then - dosym ../tls/libnvidia-tls.so ${NV_ROOT}/lib - dosym ../tls/libnvidia-tls.so.1 ${NV_ROOT}/lib - dosym ../tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib - else - dosym ../no-tls/libnvidia-tls.so ${NV_ROOT}/lib - dosym ../no-tls/libnvidia-tls.so.1 ${NV_ROOT}/lib - dosym ../no-tls/libnvidia-tls.so.${sover} ${NV_ROOT}/lib - fi - - if ! use x86-fbsd; then - # Not sure whether installing the .la file is neccessary; - # this is adopted from the `nvidia' ebuild - local ver1=$(get_version_component_range 1) - local ver2=$(get_version_component_range 2) - local ver3=$(get_version_component_range 3) - sed -e "s:\${PV}:${PV}:" \ - -e "s:\${ver1}:${ver1}:" \ - -e "s:\${ver2}:${ver2}:" \ - -e "s:\${ver3}:${ver3}:" \ - -e "s:\${libdir}:${inslibdir}:" \ - ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la - fi - - exeinto ${X11_LIB_DIR}/modules/drivers - - if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" || - has_version "x11-base/xorg-server"; then - [[ -f ${drvdir}/nvidia_drv.so ]] && \ - doexe ${drvdir}/nvidia_drv.so - else - [[ -f ${drvdir}/nvidia_drv.o ]] && \ - doexe ${drvdir}/nvidia_drv.o - fi - - insinto /usr/${inslibdir} - [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ - doins ${libdir}/libXvMCNVIDIA.a - exeinto /usr/${inslibdir} - # fix Bug 131315 - [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \ - doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \ - dosym /usr/${inslibdir}/libXvMCNVIDIA.so.${PV} \ - /usr/${inslibdir}/libXvMCNVIDIA.so - - exeinto ${NV_ROOT}/extensions - [[ -f ${extdir}/libglx.so.${sover} ]] && \ - newexe ${extdir}/libglx.so.${sover} libglx.so - - # Includes - insinto ${NV_ROOT}/include - doins ${incdir}/*.h -} - -pkg_preinst() { - # Can we make up our minds ?!?!? - local NV_D=${IMAGE:-${D}} - - if ! has_version x11-base/xorg-server ; then - for dir in lib lib32 lib64 ; do - if [[ -d ${NV_D}/usr/${dir}/xorg ]] ; then - mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir} - rmdir ${NV_D}/usr/${dir}/xorg - fi - done - fi - - # Clean the dinamic 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() { - if ! use x86-fbsd; then - linux-mod_pkg_postinst - fi - - #switch to the nvidia implementation - eselect opengl set --use-old nvidia - - echo - elog "To use the Nvidia GLX, run \"eselect opengl set nvidia\"" - echo - einfo "You may also be interested in media-video/nvidia-settings" - echo - elog "nVidia has requested that any bug reports submitted have the" - elog "output of /usr/bin/nvidia-bug-report.sh included." - echo - elog "To work with compiz, you must enable the AddARGBGLXVisuals option." - echo - elog "If you are having resolution problems, try disabling DynamicTwinView." - echo -} - -want_tls() { - # For uclibc or anything non glibc, return false - has_version sys-libs/glibc || return 1 - - # Old versions of glibc were lt/no-tls only - has_version '=sys-libs/glibc-2.3.5' ; then - case ${CHOST/-*} in - i486|i586) return 1 ;; - esac - fi - - # These versions built linuxthreads version to support tls, too - has_version '>=sys-libs/glibc-2.3.4.20040619-r2' && return 0 - - return 1 -} - -pkg_postrm() { - if ! use x86-fbsd; then - linux-mod_pkg_postrm - fi - eselect opengl set --use-old xorg-x11 -}