diff options
author | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-10-12 17:02:58 +0000 |
---|---|---|
committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-10-12 17:02:58 +0000 |
commit | 450f1c0b542e375ab043c15ac338e708d19891dc (patch) | |
tree | 5f024f877af03a54584dd60d9cfeb28c6876639d | |
parent | Added patches from nvnews.net for 8178, removing 8762, and adding a notice to... (diff) | |
download | gentoo-2-450f1c0b542e375ab043c15ac338e708d19891dc.tar.gz gentoo-2-450f1c0b542e375ab043c15ac338e708d19891dc.tar.bz2 gentoo-2-450f1c0b542e375ab043c15ac338e708d19891dc.zip |
Added patches from nvnews.net for 8178, removing 8762, and adding a notice to 9625 about AddARGBGLXVisuals for compiz.
(Portage version: 2.1.2_pre2-r8)
(Signed Manifest commit)
4 files changed, 39 insertions, 653 deletions
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 101f0d2ae9bb..837f6aef3791 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -5,10 +5,30 @@ AUX 09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca SHA1 05dd043f66f MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61 RMD160 b69c3282ba6195112e312fe34bdcb12544aef8ca files/09nvidia 61 SHA256 14702d6726cc9f0ad832a3cc90059999eb956f9e3a35397cb63cfa6347b33e39 files/09nvidia 61 -AUX 1.0.8762/NVIDIA-1.0.8762-U062606.diff 6022 RMD160 a602b837e8a539652751696586660df65de34b28 SHA1 59dbb5fc73b309cbe01c0e9ed9f532125a950897 SHA256 4f11f14fadddae2ddcc34b5f8e955c891a26406517265c5aa7dab2c810c76339 -MD5 1053576eef2e8e494c6d1ed501c792fd files/1.0.8762/NVIDIA-1.0.8762-U062606.diff 6022 -RMD160 a602b837e8a539652751696586660df65de34b28 files/1.0.8762/NVIDIA-1.0.8762-U062606.diff 6022 -SHA256 4f11f14fadddae2ddcc34b5f8e955c891a26406517265c5aa7dab2c810c76339 files/1.0.8762/NVIDIA-1.0.8762-U062606.diff 6022 +AUX 1.0.8178/NVIDIA-1.0.8178-1423627.diff 11631 RMD160 05bc5648ae086ee3aea6b212d11039ca59a87e3e SHA1 620a4655d3cab9327e178edc666287a3117a833e SHA256 aa33b50fe5c60a1ea8a6a30cbf3c5da4688d9eedb812bcfdf42402182e6fe8b1 +MD5 1cac21325aacb18a199949ee20979165 files/1.0.8178/NVIDIA-1.0.8178-1423627.diff 11631 +RMD160 05bc5648ae086ee3aea6b212d11039ca59a87e3e files/1.0.8178/NVIDIA-1.0.8178-1423627.diff 11631 +SHA256 aa33b50fe5c60a1ea8a6a30cbf3c5da4688d9eedb812bcfdf42402182e6fe8b1 files/1.0.8178/NVIDIA-1.0.8178-1423627.diff 11631 +AUX 1.0.8178/NVIDIA-1.0.8178-1427453.diff 4747 RMD160 5b00ac88fe0bfae66cd0fa83d85845954eb08e6c SHA1 dec65af429720be9603bb8c16f8bc582c5dd80af SHA256 701fa47c875908fbe066ecf5815e2e2a881abf46f4ac77191502d36e96adbb4d +MD5 2c8c7e7762e2abec50d28e3d2f190e49 files/1.0.8178/NVIDIA-1.0.8178-1427453.diff 4747 +RMD160 5b00ac88fe0bfae66cd0fa83d85845954eb08e6c files/1.0.8178/NVIDIA-1.0.8178-1427453.diff 4747 +SHA256 701fa47c875908fbe066ecf5815e2e2a881abf46f4ac77191502d36e96adbb4d files/1.0.8178/NVIDIA-1.0.8178-1427453.diff 4747 +AUX 1.0.8178/NVIDIA-1.0.8178-1435131.diff 861 RMD160 5770382c464306d2c37a00a992c67d6cec865aaf SHA1 0fcdfa11503649378ec5be1da70957c8cb9b6f19 SHA256 183bdc5abd78409ab80a60af67cb21ae663b82be1932fb2ed959fba460212e74 +MD5 d73f0a2c3d1f0efea51fb5fb944ab9e3 files/1.0.8178/NVIDIA-1.0.8178-1435131.diff 861 +RMD160 5770382c464306d2c37a00a992c67d6cec865aaf files/1.0.8178/NVIDIA-1.0.8178-1435131.diff 861 +SHA256 183bdc5abd78409ab80a60af67cb21ae663b82be1932fb2ed959fba460212e74 files/1.0.8178/NVIDIA-1.0.8178-1435131.diff 861 +AUX 1.0.8178/NVIDIA-1.0.8178-1450608.diff 468 RMD160 e1a750aac733d3e94fbaa4e9327bbb724c7bffad SHA1 86d9f8ad2127d6e8b7a699b1bb55ba47f4f42df9 SHA256 e19790e2a5c67c2c9853cd8f596921dc325368bd3238127d88fce23582172c56 +MD5 18ecb529e1dac6f96871ab4709ce0f54 files/1.0.8178/NVIDIA-1.0.8178-1450608.diff 468 +RMD160 e1a750aac733d3e94fbaa4e9327bbb724c7bffad files/1.0.8178/NVIDIA-1.0.8178-1450608.diff 468 +SHA256 e19790e2a5c67c2c9853cd8f596921dc325368bd3238127d88fce23582172c56 files/1.0.8178/NVIDIA-1.0.8178-1450608.diff 468 +AUX 1.0.8178/NVIDIA-1.0.8178-1453708.diff 7486 RMD160 d0c484137e3fd9acc574df6f949c505e514998b1 SHA1 836cfbb6a54d70d291a854a04d23a2fa21079662 SHA256 8ce0adf2b83937a1b238cc836811361980aaa8df61a93dcda60b306aa81c6022 +MD5 9e23d072c76519789a9581d341bf21fe files/1.0.8178/NVIDIA-1.0.8178-1453708.diff 7486 +RMD160 d0c484137e3fd9acc574df6f949c505e514998b1 files/1.0.8178/NVIDIA-1.0.8178-1453708.diff 7486 +SHA256 8ce0adf2b83937a1b238cc836811361980aaa8df61a93dcda60b306aa81c6022 files/1.0.8178/NVIDIA-1.0.8178-1453708.diff 7486 +AUX 1.0.8178/NVIDIA-1.0.8178-U012206.diff 24637 RMD160 f5401a1c4011ca0850b92d93e867e23c10393d6a SHA1 037b6d701fd694b0abe6c31f7f23a14302a1864f SHA256 0308a8a68ddc1295d6b5bfe1e839ae246bfb109a1ae3262436739d69862e1d9e +MD5 804a9ea8bf5164aa3248c89ab2f6792e files/1.0.8178/NVIDIA-1.0.8178-U012206.diff 24637 +RMD160 f5401a1c4011ca0850b92d93e867e23c10393d6a files/1.0.8178/NVIDIA-1.0.8178-U012206.diff 24637 +SHA256 0308a8a68ddc1295d6b5bfe1e839ae246bfb109a1ae3262436739d69862e1d9e files/1.0.8178/NVIDIA-1.0.8178-U012206.diff 24637 AUX 1.0.9625/NVIDIA-1.0.9625-i2c.diff 530 RMD160 b63e7b660fcbea4a89c75b2e1dd4f6a29d2bccab SHA1 44e6e57bbf7a4cbcc9ee9056deaf15b74546ec55 SHA256 f1033187c3f92c555c991ab7ea1b93e643df9358ef0e97492da0b79c96b8f1c6 MD5 63fdbaa357289ab2db41aabe79cd0aba files/1.0.9625/NVIDIA-1.0.9625-i2c.diff 530 RMD160 b63e7b660fcbea4a89c75b2e1dd4f6a29d2bccab files/1.0.9625/NVIDIA-1.0.9625-i2c.diff 530 @@ -34,37 +54,30 @@ MD5 e8166a48172ea0f32a3b73e2d44f30a3 files/nvidia 704 RMD160 e53af79cf9a56377908834bdbe07fa3c99a5530e files/nvidia 704 SHA256 6ac22481314de823ec31e60663521f318c7eceec75162c11cb97260db6ee0fe2 files/nvidia 704 DIST NVIDIA-FreeBSD-x86-1.0-8178.tar.gz 9067056 RMD160 75d3ef8bab67868056f540f580aa907c8a32d0b6 SHA1 4f1e7dd851a49249d9e64209ca97d6f4fa6ea3a7 SHA256 90d3fd6acf916471a6d41737e83f5ed5489effd920cb695bc44bec791262a280 -DIST NVIDIA-FreeBSD-x86-1.0-8762.tar.gz 9437999 RMD160 5b75d9b5e852b0d5222951d9d99c93d7960ee8f6 SHA1 70e6b1ed826ea0851aaefba93a15d553b1d5e725 SHA256 f29fa9dd9728a264d0b09267f23acea9ac2c04cc578b1e9644093bb2ade17875 DIST NVIDIA-FreeBSD-x86-1.0-8774.tar.gz 9449433 RMD160 f9e9a2f370bd19e5ae723e21dfaadf9328bfcdff SHA1 e9e3635824815061fd01b4ece43f5ecd8f0a3424 SHA256 a5156d4da19fa544172ec9eca4e612c6b48c7d9f932cebf695e7206343ed9a07 DIST NVIDIA-FreeBSD-x86-1.0-9625.tar.gz 9715066 RMD160 4a276d71ee699c13d28d6869a6f60c69841a0395 SHA1 2f4e4b66379c443c25bad2a35585883182d781ea SHA256 14689225ad924451a87512f245a1d5ac48c18dde128ec4277802de602c545d9e DIST NVIDIA-Linux-x86-1.0-8178-pkg1.run 12004641 RMD160 4075969c4229dd75467113b8eb22ab9645893385 SHA1 443cf4f3f608ddacc1023614f6e1b9c7f81a7ee8 SHA256 dd71799636db5a48d0f602663032dc12fdd9473841cd005b082ba812c34dc6e9 -DIST NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175 RMD160 1e887de23c5d0b9eb3a581b2d91989c1b9c45514 SHA1 bf83c71cc04117cfa4c81e38e2df07fa4dc3e8be SHA256 b38ce2853195175a2b7380fe95968d52a707a08dbe9fcb6ae423c9b9b0a47eee DIST NVIDIA-Linux-x86-1.0-8774-pkg1.run 13043959 RMD160 2d7249f4ca06db151d80870ff0da27edb402ee8a SHA1 fcd38bad3240b6b24cfef278238014351af98062 SHA256 099b597b93d794ec74b34583d3cbe6ea39f8ac5b2f7ae96d3aafbdfdd89daa83 DIST NVIDIA-Linux-x86-1.0-9625-pkg1.run 13392272 RMD160 7dbdfb791507ff340c39151ebb2377d5c2eb6e7e SHA1 9f4ffac1ee5379f33019292e003646e5b8a4f8f1 SHA256 1d04acc158e834b0d15866ad319882b49c02b32e68ecb8bc57cfa92fcc889d3b DIST NVIDIA-Linux-x86_64-1.0-8178-pkg2.run 9560594 RMD160 ee9b91f58d30d9d4800891760e24748795d07b5c SHA1 121f7c214370f832512f62a3b803833560af7de6 SHA256 bc59ded88f0d60a662a911766e923e397b8c7902cef8b293adfb1acc0669d097 -DIST NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191 RMD160 55f0ca9d35f7be6e3b65de2ed1c121e9c39c23a9 SHA1 7f2a73a2e96a94e5d44336db6a3d663cf68ad7f8 SHA256 84fb9bf70684943cc12b3e9be19de0aadbbfaa9d2118e6bef5525ac45fb0462c DIST NVIDIA-Linux-x86_64-1.0-8774-pkg2.run 9982211 RMD160 c4b60dce917fe6720b5fc2a848a195c0174b73c7 SHA1 777c5fec111190eba15b6ffcb50f3bcf24ae8191 SHA256 ffab97398bc034523ee115476d6c8b85fda2c53c18040f1d6e0971278c6f9214 DIST NVIDIA-Linux-x86_64-1.0-9625-pkg2.run 10277484 RMD160 a97d4d52e290ff201fc644c2ecb530833315d83f SHA1 38a1f94a90a31569542ab588c1b755edc15cab73 SHA256 1e126198e40f8eaf4047048d0ebe08262fcc29e440e6bae1b9195a1c751b3329 -EBUILD nvidia-drivers-1.0.8178.ebuild 12375 RMD160 8d4751292fe5ad280b93348312a456312913c853 SHA1 5dac82fe7b0930f7238b542f2201fa1ed0d6f54d SHA256 9626a7a94f797504e6d0fb71a305f46ead8cd6fb89e682f42910c836def45028 -MD5 d8a6e394af4eaf7d7936744d06388054 nvidia-drivers-1.0.8178.ebuild 12375 -RMD160 8d4751292fe5ad280b93348312a456312913c853 nvidia-drivers-1.0.8178.ebuild 12375 -SHA256 9626a7a94f797504e6d0fb71a305f46ead8cd6fb89e682f42910c836def45028 nvidia-drivers-1.0.8178.ebuild 12375 -EBUILD nvidia-drivers-1.0.8762-r1.ebuild 12447 RMD160 856cd8954bd3513b51793aa1734fea1e00873985 SHA1 ee69f11bef5c52d7c81c0d0b4e36e6c744c8430e SHA256 232e25b696134717f663fbf695c19a7927b56bf0d5204ad7303734a7b888a32c -MD5 319760c249108963d153233f0dd4edf6 nvidia-drivers-1.0.8762-r1.ebuild 12447 -RMD160 856cd8954bd3513b51793aa1734fea1e00873985 nvidia-drivers-1.0.8762-r1.ebuild 12447 -SHA256 232e25b696134717f663fbf695c19a7927b56bf0d5204ad7303734a7b888a32c nvidia-drivers-1.0.8762-r1.ebuild 12447 +EBUILD nvidia-drivers-1.0.8178.ebuild 12485 RMD160 e84e1d8006a5627f24f6d66f74dd8b319caa2571 SHA1 cc756609d3d17d89d91d488fdcebd2a95b69fdb6 SHA256 a88615abcb5d9a82f0f45724bb2e18d27d0c1b72522c8f8d8e8bbf96970b600e +MD5 1cdb33dc285e69ce4ccaf52dfa6c83a5 nvidia-drivers-1.0.8178.ebuild 12485 +RMD160 e84e1d8006a5627f24f6d66f74dd8b319caa2571 nvidia-drivers-1.0.8178.ebuild 12485 +SHA256 a88615abcb5d9a82f0f45724bb2e18d27d0c1b72522c8f8d8e8bbf96970b600e nvidia-drivers-1.0.8178.ebuild 12485 EBUILD nvidia-drivers-1.0.8774.ebuild 12387 RMD160 670ab6ce3642529d843d8d2991c7a4a44550a774 SHA1 f213a6c90ec4d9ca7a6175e77b31b7c566646414 SHA256 cfe40c10a05b2ce3b821c643d9228ea59fb396d71d9528d497b41a846451c54b MD5 74b1f210f3231b1db16148c03eb2e5ab nvidia-drivers-1.0.8774.ebuild 12387 RMD160 670ab6ce3642529d843d8d2991c7a4a44550a774 nvidia-drivers-1.0.8774.ebuild 12387 SHA256 cfe40c10a05b2ce3b821c643d9228ea59fb396d71d9528d497b41a846451c54b nvidia-drivers-1.0.8774.ebuild 12387 -EBUILD nvidia-drivers-1.0.9625.ebuild 12447 RMD160 31925d78e8a64e68efc1229ddd3871a266175be1 SHA1 c0d4bc7479167fdadf5cbec334c31e81f5b610d1 SHA256 3b6a9d3c773f6866d496845fdc3452e9b2ab843348169ad60e64185001c5e2d3 -MD5 8009bec1c4187c613ef8f2320319591c nvidia-drivers-1.0.9625.ebuild 12447 -RMD160 31925d78e8a64e68efc1229ddd3871a266175be1 nvidia-drivers-1.0.9625.ebuild 12447 -SHA256 3b6a9d3c773f6866d496845fdc3452e9b2ab843348169ad60e64185001c5e2d3 nvidia-drivers-1.0.9625.ebuild 12447 -MISC ChangeLog 3690 RMD160 acd79d5576c9a67d0ed1099ce6753335e1dadaf7 SHA1 2b4bab23567a2fdd5f827bb6fddeb76da9948200 SHA256 3fde24b765e04cdafc859563d2f3b52499c41a083dd83e5c96d2528c594a97a0 -MD5 0559baa125f717f3456dd1aeb8b6112f ChangeLog 3690 -RMD160 acd79d5576c9a67d0ed1099ce6753335e1dadaf7 ChangeLog 3690 -SHA256 3fde24b765e04cdafc859563d2f3b52499c41a083dd83e5c96d2528c594a97a0 ChangeLog 3690 +EBUILD nvidia-drivers-1.0.9625.ebuild 12531 RMD160 aecd9619a9cec412e3d39498631d47a149ec8c11 SHA1 20537d3cb429b713e446980e437c50475981c44b SHA256 6e1f892d325a3c19f1a2ad696139e6adf99ebbb4145c802fc5763ff389321048 +MD5 066c9e85b953043df7c81178050ec688 nvidia-drivers-1.0.9625.ebuild 12531 +RMD160 aecd9619a9cec412e3d39498631d47a149ec8c11 nvidia-drivers-1.0.9625.ebuild 12531 +SHA256 6e1f892d325a3c19f1a2ad696139e6adf99ebbb4145c802fc5763ff389321048 nvidia-drivers-1.0.9625.ebuild 12531 +MISC ChangeLog 4204 RMD160 a4235d7713bec67cd3a82ad4c5ebe2e8e13cd376 SHA1 7f0124bd65ad2292f916220174d931f8dd390cef SHA256 aeeabcb80363ac2ab53659465058b49c9077885e741c0bdac8129bedd8c50c42 +MD5 99f423359439ef0aee883542aad41b94 ChangeLog 4204 +RMD160 a4235d7713bec67cd3a82ad4c5ebe2e8e13cd376 ChangeLog 4204 +SHA256 aeeabcb80363ac2ab53659465058b49c9077885e741c0bdac8129bedd8c50c42 ChangeLog 4204 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302 @@ -72,9 +85,6 @@ SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f metadata MD5 912d39198d3b3254ec00bf0bdac9c964 files/digest-nvidia-drivers-1.0.8178 870 RMD160 98786a8b1dc700709f538dacb7b2ebc5bb418acc files/digest-nvidia-drivers-1.0.8178 870 SHA256 40ddd0b9152f72be231fb6f701d528ab7e0c586c2f8b6dedfc8512b080f33bed files/digest-nvidia-drivers-1.0.8178 870 -MD5 28f171942bf28c405c08215d4465cc22 files/digest-nvidia-drivers-1.0.8762-r1 870 -RMD160 1ffd48874e5e6d00782f5f9a0ef6251b3c9b8c6d files/digest-nvidia-drivers-1.0.8762-r1 870 -SHA256 7e0343d6e805357410cd03b1ce990bf79b7faf1fa7e01809ea52e14b1e0f8bb0 files/digest-nvidia-drivers-1.0.8762-r1 870 MD5 001ce5de86d073b2f9d1f7075aca2787 files/digest-nvidia-drivers-1.0.8774 870 RMD160 88f38c4e304f6b6c91063a373559721e3555c883 files/digest-nvidia-drivers-1.0.8774 870 SHA256 dba7d0016db3321eac77d5136e3f0da180cbb687969d3c1303675d4bd2ba2fee files/digest-nvidia-drivers-1.0.8774 870 @@ -84,7 +94,7 @@ SHA256 2b535b61b24af630d83d6617b3c809833616a867164d466812d56b87d8447709 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFKlCPkT4lNIS36YERAo0TAJ43OQC5WqJCFkCPRDcIemliZXMg2wCgkLBc -cf6oBRgLz3txmL+9yoJFrbI= -=XxAl +iD8DBQFFLnVBkT4lNIS36YERAtm3AKC6T2s5hndJbbSpGID+435QpRVwYwCdHiCt +52s4UWJCWeQd+60HdBXdtKQ= +=f7+2 -----END PGP SIGNATURE----- diff --git a/x11-drivers/nvidia-drivers/files/1.0.8762/NVIDIA-1.0.8762-U062606.diff b/x11-drivers/nvidia-drivers/files/1.0.8762/NVIDIA-1.0.8762-U062606.diff deleted file mode 100644 index 86ba838db964..000000000000 --- a/x11-drivers/nvidia-drivers/files/1.0.8762/NVIDIA-1.0.8762-U062606.diff +++ /dev/null @@ -1,183 +0,0 @@ -diff -ru usr/src/nv/conftest.sh usr/src/nv.1544019/conftest.sh ---- usr/src/nv/conftest.sh 2006-05-15 22:42:17.000000000 +0200 -+++ usr/src/nv.1544019/conftest.sh 2006-06-25 14:23:25.189839750 +0200 -@@ -43,7 +43,8 @@ - # Determine the number of arguments expected by remap_page_range. - # - -- echo "#include <linux/mm.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/mm.h> - void conftest_remap_page_range(void) { - remap_page_range(); - }" > conftest$$.c -@@ -56,7 +57,8 @@ - exit 1 - fi - -- echo "#include <linux/mm.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/mm.h> - int conftest_remap_page_range(void) { - pgprot_t pgprot = __pgprot(0); - return remap_page_range(NULL, 0L, 0L, 0L, pgprot); -@@ -71,7 +73,8 @@ - exit 0 - fi - -- echo "#include <linux/mm.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/mm.h> - int conftest_remap_page_range(void) { - pgprot_t pgprot = __pgprot(0); - return remap_page_range(0L, 0L, 0L, pgprot); -@@ -248,7 +251,8 @@ - # tree or at headers shipped for a specific kernel. - # Determine the kernel version using a compile check. - # -- echo "#include <linux/version.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/version.h> - #include <linux/utsname.h> - int main() { - if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) { -@@ -341,7 +345,8 @@ - # tree or at headers shipped for a specific kernel. - # Determine the kernel version using a compile check. - # -- echo "#include <linux/version.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/version.h> - int main() { - printf(\"%s\", UTS_RELEASE); - return 0; -@@ -494,7 +499,8 @@ - # Determine if change_page_attr() is present - # - -- echo "#include <linux/version.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/version.h> - #include <linux/utsname.h> - #include <linux/mm.h> - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -@@ -520,7 +526,8 @@ - # Determine if pci_get_class() is present. - # - -- echo "#include <linux/pci.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/pci.h> - void conftest_pci_get_class(void) { - pci_get_class(); - }" > conftest$$.c -@@ -541,7 +548,8 @@ - # Determine if remap_pfn_range() is present. - # - -- echo "#include <linux/mm.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/mm.h> - void conftest_remap_pfn_range(void) { - remap_pfn_range(); - }" > conftest$$.c -@@ -562,7 +570,8 @@ - # Is 'rlim' a member of current->signal? - # - -- echo "#include <linux/sched.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/sched.h> - struct rlimit *conftest_signal_struct_rlim(void) { - return current->signal->rlim; - }" > conftest$$.c -@@ -584,7 +593,8 @@ - # aware. - # - -- echo "#include <linux/types.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/types.h> - #include <linux/agp_backend.h> - typedef struct agp_bridge_data agp_bridge_data; - agp_bridge_data *conftest_agp_backend_acquire(struct pci_dev *dev) { -@@ -608,7 +618,8 @@ - # it takes. - # - -- echo "#include <linux/vmalloc.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/vmalloc.h> - void conftest_vmap(void) { - vmap(); - }" > conftest$$.c -@@ -621,7 +632,8 @@ - exit 1 - fi - -- echo "#include <linux/vmalloc.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/vmalloc.h> - void *conftest_vmap(struct page **pg, int cnt) { - return vmap(pg, cnt); - }" > conftest$$.c -@@ -635,7 +647,8 @@ - exit 0 - fi - -- echo "#include <linux/vmalloc.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/vmalloc.h> - #include <linux/mm.h> - void *conftest_vmap(struct page **pg, int cnt) { - return vmap(pg, cnt, 0, PAGE_KERNEL); -@@ -662,7 +675,8 @@ - # the inc_use() and dec_use() callback entries. - # - -- echo "#include <linux/i2c.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/i2c.h> - int conftest_i2c_adapter_inc_use() { - return offsetof(struct i2c_adapter, inc_use); - }" > conftest$$.c -@@ -684,7 +698,8 @@ - # kernel. - # - -- echo "#include <linux/sched.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/sched.h> - int conftest_sysctl_max_map_count(void) { - return sysctl_max_map_count; - }" > conftest$$.c -@@ -705,7 +720,8 @@ - # Does linux/pm.h declare the pm_message_t type? - # - -- echo "#include <linux/pm.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/pm.h> - void conftest_pm_message_t(pm_message_t state) { - pm_message_t *p = &state; - }" > conftest$$.c -@@ -726,7 +742,8 @@ - # Determine if pci_choose_state() is present. - # - -- echo "#include <linux/pci.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/pci.h> - void conftest_pci_choose_state(void) { - pci_choose_state(); - }" > conftest$$.c -@@ -747,7 +764,8 @@ - # Determine if vm_insert_page() is present. - # - -- echo "#include <linux/mm.h> -+ echo "#include <linux/autoconf.h> -+ #include <linux/mm.h> - void conftest_vm_insert_page(void) { - vm_insert_page(); - }" > conftest$$.c diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8762-r1 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8762-r1 deleted file mode 100644 index 4fbb37ab6bbc..000000000000 --- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.8762-r1 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 ddc62c375db4a6db9007bf9e2d667d2c NVIDIA-FreeBSD-x86-1.0-8762.tar.gz 9437999 -RMD160 5b75d9b5e852b0d5222951d9d99c93d7960ee8f6 NVIDIA-FreeBSD-x86-1.0-8762.tar.gz 9437999 -SHA256 f29fa9dd9728a264d0b09267f23acea9ac2c04cc578b1e9644093bb2ade17875 NVIDIA-FreeBSD-x86-1.0-8762.tar.gz 9437999 -MD5 86bcf4a3a9d441dff9e25b82ec8a6060 NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175 -RMD160 1e887de23c5d0b9eb3a581b2d91989c1b9c45514 NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175 -SHA256 b38ce2853195175a2b7380fe95968d52a707a08dbe9fcb6ae423c9b9b0a47eee NVIDIA-Linux-x86-1.0-8762-pkg1.run 13032175 -MD5 5eb0b27342fd726fbbdd1d99eadbd0e7 NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191 -RMD160 55f0ca9d35f7be6e3b65de2ed1c121e9c39c23a9 NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191 -SHA256 84fb9bf70684943cc12b3e9be19de0aadbbfaa9d2118e6bef5525ac45fb0462c NVIDIA-Linux-x86_64-1.0-8762-pkg2.run 9967191 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762-r1.ebuild deleted file mode 100644 index 4184261f0281..000000000000 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.8762-r1.ebuild +++ /dev/null @@ -1,432 +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.8762-r1.ebuild,v 1.7 2006/10/09 13:37:04 wolf31o2 Exp $ - -inherit eutils multilib versionator linux-mod - -X86_PKG_V="pkg1" -AMD64_PKG_V="pkg2" -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}-${X86_PKG_V}.run ) - amd64? ( http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.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 - !>=x11-base/xorg-server-1.0.99 - 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="-${X86_PKG_V}" - NV_PACKAGE="${X86_NV_PACKAGE}" -elif use amd64; then - PKG_V="-${AMD64_PKG_V}" - 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 patch - epatch ${NV_PATCH_PREFIX}-U062606.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 - 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 - einfo "To use the Nvidia GLX, run \"eselect opengl set nvidia\"" - echo - einfo "You may also be interested in media-video/nvidia-settings" - echo - einfo "nVidia has requested that any bug reports submitted have the" - einfo "output of /usr/bin/nvidia-bug-report.sh included." -} - -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.2' && return 1 - - local valid_chost="true" - if use x86 ; then - case ${CHOST/-*} in - i486|i586|i686) ;; - *) valid_chost="false" - esac - fi - - [[ ${valid_chost} == "false" ]] && return 1 - - # If we've got nptl, we've got tls - built_with_use sys-libs/glibc nptl && return 0 - - # 2.3.5 turned off tls for linuxthreads glibc on i486 and i586 - if use x86 && 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() { - eselect opengl set --use-old xorg-x11 -} |