diff options
| -rw-r--r-- | x11-drivers/nvidia-drivers/ChangeLog | 12 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/Manifest | 57 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9639 | 9 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.09 | 12 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.11 | 3 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia-settings.desktop | 8 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/files/nvidia-settings.png | bin | 3790 -> 0 bytes | |||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9639.ebuild (renamed from x11-drivers/nvidia-drivers/nvidia-drivers-100.14.09.ebuild) | 215 | ||||
| -rw-r--r-- | x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild | 76 |
9 files changed, 154 insertions, 238 deletions
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog index b481fed9dac7..bd1b999bda6d 100644 --- a/x11-drivers/nvidia-drivers/ChangeLog +++ b/x11-drivers/nvidia-drivers/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for x11-drivers/nvidia-drivers # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.51 2007/07/13 14:39:21 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.52 2007/07/14 10:52:13 cardoe Exp $ + +*nvidia-drivers-1.0.9639 (14 Jul 2007) + + 14 Jul 2007; Doug Goldstein <cardoe@gentoo.org> + -files/nvidia-settings.desktop, -files/nvidia-settings.png, + +nvidia-drivers-1.0.9639.ebuild, -nvidia-drivers-100.14.09.ebuild, + nvidia-drivers-100.14.11.ebuild: + add ebuild for 1.0.9639 drivers. Merge in updates from 100.14.11 drivers. + Removed old 100.14.09 drivers. No longer build nvidia-settings part of the + drivers but PDEPEND on it via gtk USE flag. Other misc cleanups. 13 Jul 2007; Doug Goldstein <doug@gentoo.org> nvidia-drivers-100.14.11.ebuild: diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest index 9546e39facad..81120aeeffa4 100644 --- a/x11-drivers/nvidia-drivers/Manifest +++ b/x11-drivers/nvidia-drivers/Manifest @@ -37,33 +37,24 @@ AUX nvidia-2 1522 RMD160 e93417c68fde706c7ad60bf352a1435a999e615e SHA1 4935687df MD5 5af339ee9d149acaf913de13d5cfe977 files/nvidia-2 1522 RMD160 e93417c68fde706c7ad60bf352a1435a999e615e files/nvidia-2 1522 SHA256 cf71f8828d36eb7f5e593ef4bb15f6540b8382b23fda4dd2a2b2b74ba7188cfc files/nvidia-2 1522 -AUX nvidia-settings.desktop 194 RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 SHA1 eac0735769b28d7c217d6ab15a3dca3e2adff9b1 SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168 -MD5 596d93feba5f2012ed21d3b44bfd0b10 files/nvidia-settings.desktop 194 -RMD160 a59dae254f65d9665118629b489b33b0fd87c8d5 files/nvidia-settings.desktop 194 -SHA256 af43af5db203c1acf9301fa7fb285a7fdfe5aab5ce1aa30a239fd7db1b588168 files/nvidia-settings.desktop 194 -AUX nvidia-settings.png 3790 RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 SHA1 ff485bf300c6e0c56b3d1f08ee87e4d9a425db65 SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12 -MD5 0ffd3b3060cafae792a0b7461614a480 files/nvidia-settings.png 3790 -RMD160 a0a8c319ca4b0100d2b7502b6a3dba20a3dc71b9 files/nvidia-settings.png 3790 -SHA256 171e2d20dfe7fbbb86bf9d3c0bb22909529b351fb06b614018a9597ff2456f12 files/nvidia-settings.png 3790 DIST NVIDIA-FreeBSD-x86-1.0-8776.tar.gz 9448963 RMD160 d646e511978ac77fddb6600eabdfc1ea32146e00 SHA1 ef27e21c6117ba912c8c4351f4e89098d6672296 SHA256 404f25862031d8f3036de33d2a0fafc3c54821a9a08832c1c1616c145d93baa5 DIST NVIDIA-FreeBSD-x86-1.0-9631.tar.gz 9667093 RMD160 2034f9086ad44ae222199e4949195dffc67274f1 SHA1 2cbeb4c732670b9eac8f95b5b5fb670ffdf03213 SHA256 2b467da57bc3bb8e2216ce3d02909cf077da045ebcf294474b784cb521a5d550 +DIST NVIDIA-FreeBSD-x86-1.0-9639.tar.gz 9668348 RMD160 d8712200f67f69e8d98b922d98268152cf6a3ce7 SHA1 cb9014e20729b0da64243c1c2ec9b680874025fc SHA256 a661f039bd838605543a460769bd18a4296717878450eec4baecc6215b91a8a6 DIST NVIDIA-FreeBSD-x86-1.0-9746.tar.gz 11152524 RMD160 8fe06d1a3af528c6fae9f94ff0e612d42e034ecd SHA1 b242fc70d8eea5825ba330dd5b1adc78df9184c4 SHA256 cf8be89d537423c0acc294e57cb659dae94463f6347f63c32b1de39c8051a5a7 DIST NVIDIA-FreeBSD-x86-1.0-9755.tar.gz 11207740 RMD160 4ed7a96a36cd53acbe3d8fa4443634589da82635 SHA1 ca5f7dd0077559fe65ea02c2e02fbaa20ff5f0d8 SHA256 c064786952f7f06a91f487dd7f1b8be5531cb56d2a624f3774e7776410326544 -DIST NVIDIA-FreeBSD-x86-100.14.09.tar.gz 647923 RMD160 2b53d1254fb2868fac17f34c51d9ecea9c09c601 SHA1 06e098dee3eea68fcc9fa1125561edcd28a81759 SHA256 db448b1c5491995b643bb7009da179ef59315cdea5f2993d0149fe10ebea9906 DIST NVIDIA-FreeBSD-x86-100.14.11.tar.gz 11419761 RMD160 ec5aa5226535bbad07bbd3bc3b3c074339cdb429 SHA1 bc6a78a19002474f116b9a4bcfa2ecd9d07769c8 SHA256 8511656f042a4b2fc2ed5571a96a2b2972fe27961540e0e63d305aaa58753e42 DIST NVIDIA-Linux-x86-1.0-8776-pkg0.run 6479231 RMD160 296dcc76c43fd65105f8d0c6f99295ee983b8872 SHA1 362902983e11e1b372a102359c6057ebb5aa7ef6 SHA256 0b25f9e407ea513cac8d600054d2dc28ca2e407caa535510210ad9fa5f45e8dc DIST NVIDIA-Linux-x86-1.0-9631-pkg0.run 6581907 RMD160 7fc0b394e0a9fbb772e43136528dbd3c2b7ac81e SHA1 52b85567907b2f32a3d3e0eef9a5a509013c05ab SHA256 d1a54248d55f2aecab735e40ae060928670a766a98dd652b2245ebd68085ca5a +DIST NVIDIA-Linux-x86-1.0-9639-pkg0.run 6587405 RMD160 dc21dc575f03e581a7a3f5d5066038a43f40833f SHA1 07b879712fb8b39ad3a11f4d5e0f16c95539e2d3 SHA256 058acd6678ae9c53c5b8083fcab3dbce1f30b77271e6553632d600acafc0bcaf DIST NVIDIA-Linux-x86-1.0-9746-pkg0.run 7733466 RMD160 7968dba12e86ecf93470d2aa1442be0ca04c4bb0 SHA1 2e4a6a870f8eb5fe2fdfa75861dedce6c78b621f SHA256 11dd3fa562bb4695a65e69b45634b91d3fa6ab7181be5f0448afd3c7efce0756 DIST NVIDIA-Linux-x86-1.0-9755-pkg0.run 7750628 RMD160 4a044add72957bfabfaac4fd19550dd4809873ee SHA1 486091e380faa85271d32f95e637dea3fbc6cdbd SHA256 5bba34a15101872d8ca339af3d4c97c83cb2a0ef81ff68a563517bc20bd29cb2 -DIST NVIDIA-Linux-x86-100.14.09-pkg0.run 7855581 RMD160 53f0a664dfb27488943697ffac618574ac388f03 SHA1 a71c46749e5ffa4e95473c13cb1183ca240cc381 SHA256 92ec9b407530018df14c7ccfef9c5e76ad8ba49ee7fd83a1324a5514a82a7b9a DIST NVIDIA-Linux-x86-100.14.11-pkg0.run 7862483 RMD160 5784e1323a4872fa56b43dd2946ec89c9b5b51c4 SHA1 95e101a5b1567bbcce91ce18f48e19d2c344ff05 SHA256 60b459b797d9fea16b4a804f71010c90bb516fe164370df488b0fdd31feab5a4 DIST NVIDIA-Linux-x86_64-1.0-8776-pkg2.run 9982646 RMD160 5cba53392aa0fd27231d01883679e1a1dba7ee34 SHA1 2a6297b89f0586192f806a18271c5e58de4eed0b SHA256 6fc8dedf782fdfe408dc0196531c301bb3bafac6878520537807118f3a2f9384 DIST NVIDIA-Linux-x86_64-1.0-9631-pkg2.run 10233636 RMD160 5e9c501fbfad27686651f64705854552be6c3f0c SHA1 add85f7b7d47c6657c1b53bbe6f8da0e1da0a1d7 SHA256 009d6e4171fa18580264ce0ace92c1c68f0702f009837f1214d77b6948223375 +DIST NVIDIA-Linux-x86_64-1.0-9639-pkg2.run 10240436 RMD160 aeb23cfbed6cef57bec4f4e94b897a0cc9fb2f14 SHA1 4e5fb164881cf4d13b12a811bc03a367e6860a7b SHA256 64cb092b05f0865cc176dce5155009958f44d59f57c307de8bcf85834c1d6e3d DIST NVIDIA-Linux-x86_64-1.0-9746-pkg2.run 11743919 RMD160 b3a050ea487e627cdf2e9ba8dab8a178be6d0bfc SHA1 eee24a1db159c4cadc367f1ab2ed8306e23c89fe SHA256 22f9f09a5ceca852c20f12690ac396738f26e150713b2e56cbb42e752454abf9 DIST NVIDIA-Linux-x86_64-1.0-9755-pkg2.run 11768823 RMD160 dbc5f34410294de21cadcd17216c45000a0464a1 SHA1 28fb1ac0948a583e8c760b541e19614f3f6ba0d4 SHA256 eaa467d3cde6fe61feb0cbe911316742e03e841d18a94c531caffa42457be785 -DIST NVIDIA-Linux-x86_64-100.14.09-pkg2.run 11834257 RMD160 d8c7987c4053835ec4d23facee855ebc35d95da4 SHA1 001bce9cba1c8ba31b0e942e85b429a5533ca72c SHA256 554aa9e63f1ac9e5f2f218f8532a73b514783d5ea1c674bbf888500998877ec7 DIST NVIDIA-Linux-x86_64-100.14.11-pkg2.run 11838502 RMD160 d357c75e9043e1cb089b3136635af04c88420943 SHA1 d542b702fdf7835f5dc7ec767789b2c1ada60908 SHA256 3215f786838d2d05005ec53cc9e3a684d46939ae2ea8c8e6b3e20f092be3b5e1 -DIST nvidia-settings-1.0.tar.gz 1100735 RMD160 96f68ecde52aba2e58976406f4a907e4932b5f32 SHA1 ee81d837cf20fbfa45d4f9d9338e715229d581a5 SHA256 48e0a8b6a0b1cae6881e3c33cb0bdbddb34f7f7d009c91dc0a6826f94736c480 EBUILD nvidia-drivers-1.0.8776-r1.ebuild 12806 RMD160 a3c3d32b808b5d4898d7a14b586ae4458586b51b SHA1 f2ff4b8f7d9cb0baa1cd5967560ea9938174965a SHA256 5004c4eb6a6ec9f6f21161a5d2d70b93429af224380c1e17249406bf0f518987 MD5 d25f21ac04c3824816fd3a96847b9aca nvidia-drivers-1.0.8776-r1.ebuild 12806 RMD160 a3c3d32b808b5d4898d7a14b586ae4458586b51b nvidia-drivers-1.0.8776-r1.ebuild 12806 @@ -72,6 +63,10 @@ EBUILD nvidia-drivers-1.0.9631-r1.ebuild 13026 RMD160 15ad00107fdb9a4dc2c869bf94 MD5 f14269e6f5e422c4aae6c9607fb3427f nvidia-drivers-1.0.9631-r1.ebuild 13026 RMD160 15ad00107fdb9a4dc2c869bf946b87eab23d742b nvidia-drivers-1.0.9631-r1.ebuild 13026 SHA256 c84fa3da30a78d3662eb6fe20437831766b72ab9be4e47a9568c17ebb1bb9af5 nvidia-drivers-1.0.9631-r1.ebuild 13026 +EBUILD nvidia-drivers-1.0.9639.ebuild 14048 RMD160 e446e72e14bf715b5087b5bc38478eda8202114b SHA1 0a8c629847b2108ae30c4860a170d6f1cba2065c SHA256 e6a3feb6aed6984c8f9bce79344973cc37249edb6c4550f39bce6d487b062da7 +MD5 081750ff645dbfc2bdf868473a83dc7b nvidia-drivers-1.0.9639.ebuild 14048 +RMD160 e446e72e14bf715b5087b5bc38478eda8202114b nvidia-drivers-1.0.9639.ebuild 14048 +SHA256 e6a3feb6aed6984c8f9bce79344973cc37249edb6c4550f39bce6d487b062da7 nvidia-drivers-1.0.9639.ebuild 14048 EBUILD nvidia-drivers-1.0.9746-r1.ebuild 13186 RMD160 a980c2775e9e034cc46480c8b85f0d05c0a10c3f SHA1 2b2387bb73267ffc95f1cf0508011ff81a87c51f SHA256 6d8b0d604a935af8b2881532565a48d5d95d39934fb5d984e6c7237606bfc303 MD5 730714ab8522bb696afed2f536655dde nvidia-drivers-1.0.9746-r1.ebuild 13186 RMD160 a980c2775e9e034cc46480c8b85f0d05c0a10c3f nvidia-drivers-1.0.9746-r1.ebuild 13186 @@ -80,18 +75,14 @@ EBUILD nvidia-drivers-1.0.9755-r1.ebuild 13186 RMD160 9f6199feccc6905bfa7fe65120 MD5 ff3ecb4071194fd915b449d1d8b68374 nvidia-drivers-1.0.9755-r1.ebuild 13186 RMD160 9f6199feccc6905bfa7fe6512063bbd91f794752 nvidia-drivers-1.0.9755-r1.ebuild 13186 SHA256 2037b27a3cc3fd351a1e35eb6bf444f0a23906a0333f9d3b9c69d944ce26cea3 nvidia-drivers-1.0.9755-r1.ebuild 13186 -EBUILD nvidia-drivers-100.14.09.ebuild 14407 RMD160 4ff5c2fded86ccc4b753ea16726d9f9d861bb216 SHA1 cbfcd39e80e09a3deb2bb87f97c3db54a19ef89f SHA256 57384e35cdce92bebbff272244f78d0f2fa3b633569cef64e61dffdcb4a6334d -MD5 ff6cfb08ecc905d0b6687533f914a727 nvidia-drivers-100.14.09.ebuild 14407 -RMD160 4ff5c2fded86ccc4b753ea16726d9f9d861bb216 nvidia-drivers-100.14.09.ebuild 14407 -SHA256 57384e35cdce92bebbff272244f78d0f2fa3b633569cef64e61dffdcb4a6334d nvidia-drivers-100.14.09.ebuild 14407 -EBUILD nvidia-drivers-100.14.11.ebuild 15481 RMD160 b9ac5cd0bc59eb845199e0e4e8981eabfd67cc6a SHA1 c9ef10c173d6f20c080dba4424c4e042c7192083 SHA256 e313196ceef8a328944d9f731922202982390775c6dae3c27c7cd5875666b51e -MD5 8b08139596c46a98bbf4ec75bc6b9d95 nvidia-drivers-100.14.11.ebuild 15481 -RMD160 b9ac5cd0bc59eb845199e0e4e8981eabfd67cc6a nvidia-drivers-100.14.11.ebuild 15481 -SHA256 e313196ceef8a328944d9f731922202982390775c6dae3c27c7cd5875666b51e nvidia-drivers-100.14.11.ebuild 15481 -MISC ChangeLog 11719 RMD160 c8d5936cd1afbfc6ad05d6235db685b08401c2b4 SHA1 b93f86339c08caa20569f10e8fc9566d5f3406f6 SHA256 dab51b6f1abc041b73643e69c803992c49029f189a1a6c3c2576f6b7e752bd95 -MD5 c9d86939bafa9c414a30a8a5e9ad0bfe ChangeLog 11719 -RMD160 c8d5936cd1afbfc6ad05d6235db685b08401c2b4 ChangeLog 11719 -SHA256 dab51b6f1abc041b73643e69c803992c49029f189a1a6c3c2576f6b7e752bd95 ChangeLog 11719 +EBUILD nvidia-drivers-100.14.11.ebuild 14049 RMD160 f2185d53bac07625b1fe5992510a494670b73de5 SHA1 9e53af3efd835f34c5eb58f256e24ed65436d4de SHA256 89452aa130f3a4e5666214ea89e65798a521c1f6623c58081ec2d6b9af5e5f6a +MD5 6c15e99eeeef91a44937b2c71cd7bffc nvidia-drivers-100.14.11.ebuild 14049 +RMD160 f2185d53bac07625b1fe5992510a494670b73de5 nvidia-drivers-100.14.11.ebuild 14049 +SHA256 89452aa130f3a4e5666214ea89e65798a521c1f6623c58081ec2d6b9af5e5f6a nvidia-drivers-100.14.11.ebuild 14049 +MISC ChangeLog 12196 RMD160 905fc3b3f1a0f658fe9b37856f9dc7c9a1bac718 SHA1 d6534ede7a5cbf5ea00be8092486a0f818a80f30 SHA256 40e82a2012ddf85df34c33eef21dae3d35b71e3a0f452f2012e208de1142fa75 +MD5 e57d563bbfe23facfda9a37b2214cde8 ChangeLog 12196 +RMD160 905fc3b3f1a0f658fe9b37856f9dc7c9a1bac718 ChangeLog 12196 +SHA256 40e82a2012ddf85df34c33eef21dae3d35b71e3a0f452f2012e208de1142fa75 ChangeLog 12196 MISC metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 SHA1 47dde751e4e0c833a65f32e106e594f449fe58a2 SHA256 0aa0f01ad14674164a2898387b83ded31b2b67a12757165debe6b03ee2fd692f MD5 643cec14f7f1dda9a26f163853dbf080 metadata.xml 302 RMD160 66c75d5895f747b8ce5af0f80b90af8fea1d07d7 metadata.xml 302 @@ -102,22 +93,22 @@ SHA256 9a2c001f4a7d6b6461ae0ed151c958442f1bc15f7c4515f499d876a503d41f92 files/di MD5 baf86828177883fd75ffdcf2b73c1f4c files/digest-nvidia-drivers-1.0.9631-r1 710 RMD160 049e1a3e116e6bd9c226423f82871ff063499dff files/digest-nvidia-drivers-1.0.9631-r1 710 SHA256 7ddaa09b148b62ce4ec3f84c4cab5a959e463dc4c12ffc1c2fbb6b96e551f22e files/digest-nvidia-drivers-1.0.9631-r1 710 +MD5 175d64f3601adc1c5c085a6164f6b828 files/digest-nvidia-drivers-1.0.9639 870 +RMD160 5cb5af0663450b5fa3ede68291c936e4f8aadd1e files/digest-nvidia-drivers-1.0.9639 870 +SHA256 ee9a11c805541adacb241ecacb91203c4fe65ec3e6690350c23022dc8832ee41 files/digest-nvidia-drivers-1.0.9639 870 MD5 288c8bcf08292abe4f7ec43168890bf4 files/digest-nvidia-drivers-1.0.9746-r1 873 RMD160 030aedf4c386fb0df0568fb35f62a36db9697901 files/digest-nvidia-drivers-1.0.9746-r1 873 SHA256 7a5e7a36e96d0a168150703a0d7c9d5d6604a66046b50d9a81a34f3066bf0c2d files/digest-nvidia-drivers-1.0.9746-r1 873 MD5 b5eee0015ba9c577cc726a3d2c12ae31 files/digest-nvidia-drivers-1.0.9755-r1 873 RMD160 f8491760b7f68c1ab846c55517131773f14e0c83 files/digest-nvidia-drivers-1.0.9755-r1 873 SHA256 8950b102eca59ec72c39db57778a0c47ea65f8bd29abe4c00307fd8bfd64afd3 files/digest-nvidia-drivers-1.0.9755-r1 873 -MD5 94d1fb0d78cf1f5be3665a6e0e6d2304 files/digest-nvidia-drivers-100.14.09 1138 -RMD160 a3e0aea145c7e16377f82e9460315994cb75bf6f files/digest-nvidia-drivers-100.14.09 1138 -SHA256 86d435ab92185bf58edba8ca26e5385bd89da3162142056175b40823d621130c files/digest-nvidia-drivers-100.14.09 1138 -MD5 3952fb5ac27bca1db5d94009cbc068a4 files/digest-nvidia-drivers-100.14.11 1144 -RMD160 0b8ea0cbce87503a154a2636f1338a2348124adb files/digest-nvidia-drivers-100.14.11 1144 -SHA256 fcec2f6d7426226e77134009ac806252546baed3c5a99ba5b31ee730e8efcfe0 files/digest-nvidia-drivers-100.14.11 1144 +MD5 cba58f442904bf8a62fef0ea1abc4006 files/digest-nvidia-drivers-100.14.11 882 +RMD160 a4f0cf0451ffaeb2f16eb1b695dde71d48bac51f files/digest-nvidia-drivers-100.14.11 882 +SHA256 5008f54f8a60cbc1d7460b00f9d4ab8c0b6ca211f51345f52815692965e808d2 files/digest-nvidia-drivers-100.14.11 882 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (GNU/Linux) -iD8DBQFGl8Q6oeSe8B0zEfwRAlA1AJwMKg/RCY00aq4LtAIbF2GDLbm7owCfZHcg -VXpOrGtVG37CvTGIXRxAeWk= -=Z/u1 +iD8DBQFGmKrroeSe8B0zEfwRAiuNAJ4j4tK6Yt6yh73U2FdbJpcASwDYnACfaK3F +GZHncPK55RgOTvh5cY/tQDk= +=8cKR -----END PGP SIGNATURE----- diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9639 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9639 new file mode 100644 index 000000000000..876e763d4862 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-1.0.9639 @@ -0,0 +1,9 @@ +MD5 2947394ea9f6a7f7dc6e5bcdd1f6e3db NVIDIA-FreeBSD-x86-1.0-9639.tar.gz 9668348 +RMD160 d8712200f67f69e8d98b922d98268152cf6a3ce7 NVIDIA-FreeBSD-x86-1.0-9639.tar.gz 9668348 +SHA256 a661f039bd838605543a460769bd18a4296717878450eec4baecc6215b91a8a6 NVIDIA-FreeBSD-x86-1.0-9639.tar.gz 9668348 +MD5 3d8b8b700a0c5a34eb39c8ca70a57f72 NVIDIA-Linux-x86-1.0-9639-pkg0.run 6587405 +RMD160 dc21dc575f03e581a7a3f5d5066038a43f40833f NVIDIA-Linux-x86-1.0-9639-pkg0.run 6587405 +SHA256 058acd6678ae9c53c5b8083fcab3dbce1f30b77271e6553632d600acafc0bcaf NVIDIA-Linux-x86-1.0-9639-pkg0.run 6587405 +MD5 c84db1dd38a965e9074e14f59ecd2331 NVIDIA-Linux-x86_64-1.0-9639-pkg2.run 10240436 +RMD160 aeb23cfbed6cef57bec4f4e94b897a0cc9fb2f14 NVIDIA-Linux-x86_64-1.0-9639-pkg2.run 10240436 +SHA256 64cb092b05f0865cc176dce5155009958f44d59f57c307de8bcf85834c1d6e3d NVIDIA-Linux-x86_64-1.0-9639-pkg2.run 10240436 diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.09 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.09 deleted file mode 100644 index 3580914f700f..000000000000 --- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.09 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 979a43c663c29b7bd440558866a90e85 NVIDIA-FreeBSD-x86-100.14.09.tar.gz 647923 -RMD160 2b53d1254fb2868fac17f34c51d9ecea9c09c601 NVIDIA-FreeBSD-x86-100.14.09.tar.gz 647923 -SHA256 db448b1c5491995b643bb7009da179ef59315cdea5f2993d0149fe10ebea9906 NVIDIA-FreeBSD-x86-100.14.09.tar.gz 647923 -MD5 bc3295a0e14feaab41af59b56f12f19e NVIDIA-Linux-x86-100.14.09-pkg0.run 7855581 -RMD160 53f0a664dfb27488943697ffac618574ac388f03 NVIDIA-Linux-x86-100.14.09-pkg0.run 7855581 -SHA256 92ec9b407530018df14c7ccfef9c5e76ad8ba49ee7fd83a1324a5514a82a7b9a NVIDIA-Linux-x86-100.14.09-pkg0.run 7855581 -MD5 0717c0468378647f1e4468c12c1ed72a NVIDIA-Linux-x86_64-100.14.09-pkg2.run 11834257 -RMD160 d8c7987c4053835ec4d23facee855ebc35d95da4 NVIDIA-Linux-x86_64-100.14.09-pkg2.run 11834257 -SHA256 554aa9e63f1ac9e5f2f218f8532a73b514783d5ea1c674bbf888500998877ec7 NVIDIA-Linux-x86_64-100.14.09-pkg2.run 11834257 -MD5 414a838f01093ceb0ae8535c35e21eac nvidia-settings-1.0.tar.gz 1100735 -RMD160 96f68ecde52aba2e58976406f4a907e4932b5f32 nvidia-settings-1.0.tar.gz 1100735 -SHA256 48e0a8b6a0b1cae6881e3c33cb0bdbddb34f7f7d009c91dc0a6826f94736c480 nvidia-settings-1.0.tar.gz 1100735 diff --git a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.11 b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.11 index d0720dcdcac5..09f448a7d1aa 100644 --- a/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.11 +++ b/x11-drivers/nvidia-drivers/files/digest-nvidia-drivers-100.14.11 @@ -7,6 +7,3 @@ SHA256 60b459b797d9fea16b4a804f71010c90bb516fe164370df488b0fdd31feab5a4 NVIDIA-L MD5 060dfcab02bc903ce6f18da4fad6f74f NVIDIA-Linux-x86_64-100.14.11-pkg2.run 11838502 RMD160 d357c75e9043e1cb089b3136635af04c88420943 NVIDIA-Linux-x86_64-100.14.11-pkg2.run 11838502 SHA256 3215f786838d2d05005ec53cc9e3a684d46939ae2ea8c8e6b3e20f092be3b5e1 NVIDIA-Linux-x86_64-100.14.11-pkg2.run 11838502 -MD5 414a838f01093ceb0ae8535c35e21eac nvidia-settings-1.0.tar.gz 1100735 -RMD160 96f68ecde52aba2e58976406f4a907e4932b5f32 nvidia-settings-1.0.tar.gz 1100735 -SHA256 48e0a8b6a0b1cae6881e3c33cb0bdbddb34f7f7d009c91dc0a6826f94736c480 nvidia-settings-1.0.tar.gz 1100735 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-settings.desktop b/x11-drivers/nvidia-drivers/files/nvidia-settings.desktop deleted file mode 100644 index 65f2fd56b7f6..000000000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-settings.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=NVIDIA X Server Settings -Comment=Configure NVIDIA X Server Settings -Exec=nvidia-settings -Icon=nvidia-settings -Categories=Application;System; diff --git a/x11-drivers/nvidia-drivers/files/nvidia-settings.png b/x11-drivers/nvidia-drivers/files/nvidia-settings.png Binary files differdeleted file mode 100644 index 361c20050d59..000000000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-settings.png +++ /dev/null diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9639.ebuild index e2aaf5a1357b..9b0aa6db12ba 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.09.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9639.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.09.ebuild,v 1.3 2007/07/05 22:29:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-1.0.9639.ebuild,v 1.1 2007/07/14 10:52:13 cardoe Exp $ -inherit eutils multilib versionator linux-mod flag-o-matic +inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver -SETTINGS_V="1.0" NV_V="${PV/1.0./1.0-}" X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}" AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}" @@ -14,35 +13,27 @@ DESCRIPTION="NVIDIA X11 driver and GLX libraries" HOMEPAGE="http://www.nvidia.com/" SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-pkg0.run ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-pkg2.run ) - x86-fbsd? ( http://us.download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz ) - ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${SETTINGS_V}.tar.gz" + x86-fbsd? ( http://us.download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )" LICENSE="NVIDIA" SLOT="0" KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd" -IUSE="" +IUSE="gtk multilib" RESTRICT="strip" EMULTILIB_PKG="true" COMMON="x11-base/xorg-server - x11-libs/libXt + multilib? ( app-emulation/emul-linux-x86-xlibs ) kernel_FreeBSD? ( !media-video/nvidia-freebsd ) - !media-video/nvidia-settings !app-emulation/emul-linux-x86-nvidia !x11-drivers/nvidia-legacy-drivers" DEPEND="${COMMON} - kernel_linux? ( virtual/linux-sources ) - >=x11-libs/gtk+-2 - dev-util/pkgconfig - x11-libs/libXv - x11-proto/xf86driproto - x11-misc/imake - x11-misc/gccmakedep" + kernel_linux? ( virtual/linux-sources )" RDEPEND="${COMMON} kernel_linux? ( virtual/modutils ) media-libs/mesa - app-admin/eselect-opengl - >=x11-libs/gtk+-2" + app-admin/eselect-opengl" +PDEPEND="gtk? ( media-video/nvidia-settings )" QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV} usr/lib/opengl/nvidia/lib/libGL.so.${PV} @@ -94,19 +85,18 @@ QA_WX_LOAD_amd64="usr/lib64/opengl/nvidia/lib/libGL.so.${PV} export _POSIX2_VERSION="199209" -if use x86 ; then +if use x86; then PKG_V="-pkg0" NV_PACKAGE="${X86_NV_PACKAGE}" -elif use amd64 ; then +elif use amd64; then PKG_V="-pkg2" NV_PACKAGE="${AMD64_NV_PACKAGE}" -elif use x86-fbsd ; then +elif use x86-fbsd; then PKG_V="" NV_PACKAGE="${X86_FBSD_NV_PACKAGE}" fi S="${WORKDIR}/${NV_PACKAGE}${PKG_V}/usr/src/nv" -SETTINGS_DIR="${WORKDIR}/nvidia-settings-${SETTINGS_V}" # On BSD userland it wants real make command MAKE="make" @@ -129,23 +119,29 @@ mtrr_check() { } pkg_setup() { - if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ] ; then + 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 + 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 + + # 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 } src_unpack() { local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA-${PV}" - if ! use x86-fbsd ; then + 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}" @@ -157,9 +153,9 @@ src_unpack() { fi fi - if ! use x86-fbsd ; then + if ! use x86-fbsd; then cd "${WORKDIR}" - bash "${DISTDIR}/${NV_PACKAGE}${PKG_V}.run" --extract-only + bash ${DISTDIR}/${NV_PACKAGE}${PKG_V}.run --extract-only else unpack ${A} fi @@ -172,8 +168,10 @@ src_unpack() { 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 + # allow on board sensors to work with lm_sensors + epatch "${FILESDIR}"/NVIDIA_i2c-hwmon.patch - if ! use x86-fbsd ; then + if ! use x86-fbsd; then # Quiet down warnings the user does not need to see sed -i \ -e 's:-Wpointer-arith::g' \ @@ -184,53 +182,41 @@ src_unpack() { [[ -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 + cd "${S}"; convert_to_m Makefile.kbuild fi - - cd "${WORKDIR}" - unpack "nvidia-settings-${SETTINGS_V}.tar.gz" - cd "${SETTINGS_DIR}" || die - sed -i.orig \ - -e 's,DoNormalLib NormalLibXrandr,DoNormalLib YES,g' \ - src/libXNVCtrl/Imakefile || die "sed Imakefile" } 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 + if use x86-fbsd; then cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}/src" echo LDFLAGS="$(raw-ldflags)" MAKE="$(get_bmake)" emake CC="$(tc-getCC)" LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die else linux-mod_src_compile fi - - # nvidia-settings - einfo "Building libXNVCtrl..." - cd "${SETTINGS_DIR}/src/libXNVCtrl" - xmkmf -a || die "Running xmkmf failed" - make clean || die "Cleaning old libXNVCtrl failed" - emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake libXNVCtrl" - - cd "${SETTINGS_DIR}" - einfo "Building nVidia-Settings..." - emake CC="$(tc-getCC)" || die "emake settings" } src_install() { local MLTEST=$(type dyn_unpack) - cd "${WORKDIR}/${NV_PACKAGE}${PKG_V}" + cd "${WORKDIR}"/${NV_PACKAGE}${PKG_V} - if ! use x86-fbsd ; then + if ! use x86-fbsd; 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 ]] || die "nvidia missing in FILESDIR" - sed -e 's:\${PACKAGE}:'${PF}':g' "${FILESDIR}"/nvidia > "${WORKDIR}"/nvidia + [ -f "${FILESDIR}/nvidia-2" ] || die "nvidia-2 missing in FILESDIR" + sed -e 's:\${PACKAGE}:'${PF}':g' \ + -e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-2 > "${WORKDIR}"/nvidia insinto /etc/modules.d newins "${WORKDIR}"/nvidia nvidia || die else @@ -249,18 +235,18 @@ src_install() { ABI=${OABI} unset OABI elif use amd64 ; then - src_install-libs lib32 "$(get_multilibdir)" - src_install-libs lib "$(get_libdir)" + 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 + 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 + if ! use x86-fbsd; then # Docs newdoc usr/share/doc/README.txt README dodoc usr/share/doc/Copyrights usr/share/doc/NVIDIA_Changelog @@ -274,22 +260,8 @@ src_install() { dohtml doc/html/* fi - # Taking nvidia-settings from nvidia-drivers - more up-to-date - dobin usr/bin/nvidia-{settings,xconfig} || die - - # nvidia-settings - cd "${SETTINGS_DIR}" - insinto "/usr/$(get_libdir)" - doins src/libXNVCtrl/libXNVCtrl.a || die - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h || die - - # Install icon and .desktop entry - doicon "${FILESDIR}/nvidia-settings.png" || die "doicon" - domenu "${FILESDIR}/nvidia-settings.desktop" || die "domenu" - - doman doc/nvidia-settings.1 || die - dodoc doc/*.txt + # Taking nvidia-xconfig from nvidia-drivers to help config xorg.conf + dobin usr/bin/nvidia-xconfig || die } # Install nvidia library: @@ -303,9 +275,9 @@ donvidia() { libname=$(basename $2) doexe $2.$3 - dosym "${libname}.${3}" "${1}/${libname}" + dosym ${libname}.$3 $1/${libname} - [[ ${3} != "1" ]] && dosym "${libname}.${3}" "${1}/${libname}.1" + [[ $3 != "1" ]] && dosym ${libname}.$3 $1/${libname}.1 } src_install-libs() { @@ -321,9 +293,8 @@ src_install-libs() { local usrpkglibdir=usr/${pkglibdir} local libdir=usr/X11R6/${pkglibdir} - local modules=${libdir}/modules - local drvdir=${modules}/drivers - local extdir=${modules}/extensions + 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" @@ -335,7 +306,7 @@ src_install-libs() { X11_LIB_DIR="/usr/${inslibdir}" fi - if use x86-fbsd ; then + if use x86-fbsd; then # on FreeBSD everything is on obj/ pkglibdir=obj usrpkglibdir=obj @@ -351,32 +322,31 @@ src_install-libs() { fi # The GLX libraries - donvidia "${NV_ROOT}"/lib "${usrpkglibdir}"/libGL.so "${sover}" - donvidia "${NV_ROOT}"/lib "${usrpkglibdir}"/libGLcore.so "${sover}" + donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGL.so ${sover} + donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libGLcore.so ${sover} - donvidia "${NV_ROOT}"/lib "${usrpkglibdir}"/libnvidia-cfg.so "${sover}" + donvidia ${NV_ROOT}/lib ${usrpkglibdir}/libnvidia-cfg.so ${sover} - dodir "${NO_TLS_ROOT}" - donvidia "${NO_TLS_ROOT}" "${usrpkglibdir}"/libnvidia-tls.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}" + 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 + 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 + 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 + if ! use x86-fbsd; then # Install the .la file for libtool, to prevent e.g. bug #176423 - [[ -f "${FILESDIR}"/libGL.la-r2 ]] \ - || die "libGL.la-r2 missing in FILESDIR" + [ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR" local ver1=$(get_version_component_range 1) local ver2=$(get_version_component_range 2) local ver3=$(get_version_component_range 3) @@ -385,44 +355,44 @@ src_install-libs() { -e "s:\${ver2}:${ver2}:" \ -e "s:\${ver3}:${ver3}:" \ -e "s:\${libdir}:${inslibdir}:" \ - "${FILESDIR}"/libGL.la-r2 > "${D}/${NV_ROOT}"/lib/libGL.la + "${FILESDIR}"/libGL.la-r2 > "${D}"/${NV_ROOT}/lib/libGL.la fi - exeinto "${X11_LIB_DIR}"/modules/drivers + exeinto ${X11_LIB_DIR}/modules/drivers [[ -f ${drvdir}/nvidia_drv.so ]] && \ - doexe "${drvdir}"/nvidia_drv.so + doexe ${drvdir}/nvidia_drv.so - insinto "/usr/${inslibdir}" + insinto /usr/${inslibdir} [[ -f ${libdir}/libXvMCNVIDIA.a ]] && \ - doins "${libdir}"/libXvMCNVIDIA.a - exeinto "/usr/${inslibdir}" + doins ${libdir}/libXvMCNVIDIA.a + exeinto /usr/${inslibdir} # fix Bug 131315 [[ -f ${libdir}/libXvMCNVIDIA.so.${PV} ]] && \ - doexe "${libdir}/libXvMCNVIDIA.so.${PV}" && \ - dosym "libXvMCNVIDIA.so.${PV}" \ - "/usr/${inslibdir}"/libXvMCNVIDIA.so + doexe ${libdir}/libXvMCNVIDIA.so.${PV} && \ + dosym libXvMCNVIDIA.so.${PV} \ + /usr/${inslibdir}/libXvMCNVIDIA.so - exeinto "${NV_ROOT}"/extensions - [[ -f ${modules}/libnvidia-wfb.so.${sover} ]] && \ - newexe "${modules}/libnvidia-wfb.so.${sover}" libwfb.so + exeinto ${NV_ROOT}/extensions + [[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \ + newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so [[ -f ${extdir}/libglx.so.${sover} ]] && \ - newexe "${extdir}/libglx.so.${sover}" libglx.so + newexe ${extdir}/libglx.so.${sover} libglx.so # Includes - insinto "${NV_ROOT}"/include - doins "${incdir}"/*.h + insinto ${NV_ROOT}/include + doins ${incdir}/*.h } pkg_preinst() { # Can we make up our minds ?!?!? - local NV_D=${D} dir + local NV_D=${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 + mv ${NV_D}/usr/${dir}/xorg/* ${NV_D}/usr/${dir} + rmdir ${NV_D}/usr/${dir}/xorg fi done fi @@ -430,21 +400,32 @@ 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/* + 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 + rm -f ${ROOT}/etc/env.d/09nvidia fi } pkg_postinst() { - if ! use x86-fbsd ; then + 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\"" + elog + elog "nVidia has requested that any bug reports submitted have the" + elog "output of /usr/bin/nvidia-bug-report.sh included." + elog + elog "To work with compiz, you must enable the AddARGBGLXVisuals option." + elog + elog "If you are having resolution problems, try disabling DynamicTwinView." + echo } want_tls() { @@ -481,7 +462,7 @@ want_tls() { } pkg_postrm() { - if ! use x86-fbsd ; then + if ! use x86-fbsd; then linux-mod_pkg_postrm fi eselect opengl set --use-old xorg-x11 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild index f16d9a8c2b12..70d91c1b7694 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild,v 1.6 2007/07/13 18:27:39 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-100.14.11.ebuild,v 1.7 2007/07/14 10:52:13 cardoe Exp $ inherit eutils multilib versionator linux-mod flag-o-matic nvidia-driver -SETTINGS_V="1.0" NV_V="${PV/1.0./1.0-}" X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}" AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}" @@ -14,8 +13,7 @@ DESCRIPTION="NVIDIA X11 driver and GLX libraries" HOMEPAGE="http://www.nvidia.com/" SRC_URI="x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-pkg0.run ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-pkg2.run ) - x86-fbsd? ( http://us.download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz ) - gtk? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${SETTINGS_V}.tar.gz )" + x86-fbsd? ( http://us.download.nvidia.com/freebsd/${NV_V}/${X86_FBSD_NV_PACKAGE}.tar.gz )" LICENSE="NVIDIA" SLOT="0" @@ -25,25 +23,17 @@ RESTRICT="strip" EMULTILIB_PKG="true" COMMON="x11-base/xorg-server - x11-libs/libXt - kernel_FreeBSD? ( !media-video/nvidia-freebsd ) multilib? ( app-emulation/emul-linux-x86-xlibs ) - !media-video/nvidia-settings + kernel_FreeBSD? ( !media-video/nvidia-freebsd ) !app-emulation/emul-linux-x86-nvidia !x11-drivers/nvidia-legacy-drivers" DEPEND="${COMMON} - kernel_linux? ( virtual/linux-sources ) - >=x11-libs/gtk+-2 - dev-util/pkgconfig - x11-libs/libXv - x11-proto/xf86driproto - x11-misc/imake - x11-misc/gccmakedep" + kernel_linux? ( virtual/linux-sources )" RDEPEND="${COMMON} kernel_linux? ( virtual/modutils ) media-libs/mesa - app-admin/eselect-opengl - >=x11-libs/gtk+-2" + app-admin/eselect-opengl" +PDEPEND="gtk? ( media-video/nvidia-settings )" QA_TEXTRELS_x86="usr/lib/xorg/libXvMCNVIDIA.so.${PV} usr/lib/opengl/nvidia/lib/libGL.so.${PV} @@ -107,7 +97,6 @@ elif use x86-fbsd; then fi S="${WORKDIR}/${NV_PACKAGE}${PKG_V}/usr/src/nv" -SETTINGS_DIR="${WORKDIR}/nvidia-settings-${SETTINGS_V}" # On BSD userland it wants real make command MAKE="make" @@ -195,15 +184,6 @@ src_unpack() { # If greater than 2.6.5 use M= instead of SUBDIR= cd "${S}"; convert_to_m Makefile.kbuild fi - - if use gtk; then - cd "${WORKDIR}" - unpack "nvidia-settings-${SETTINGS_V}.tar.gz" - cd "${SETTINGS_DIR}" || die - sed -i.orig \ - -e 's,DoNormalLib NormalLibXrandr,DoNormalLib YES,g' \ - src/libXNVCtrl/Imakefile || die "sed Imakefile" - fi } src_compile() { @@ -217,19 +197,6 @@ src_compile() { else linux-mod_src_compile fi - - if use gtk; then - # nvidia-settings - einfo "Building libXNVCtrl..." - cd "${SETTINGS_DIR}/src/libXNVCtrl" - xmkmf -a || die "Running xmkmf failed" - make clean || die "Cleaning old libXNVCtrl failed" - emake CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake libXNVCtrl" - - cd "${SETTINGS_DIR}" - einfo "Building nVidia-Settings..." - emake CC="$(tc-getCC)" || die "emake settings" - fi } src_install() { @@ -247,7 +214,7 @@ src_install() { fi # Add the aliases - [[ -f "${FILESDIR}"/nvidia-2 ]] || die "nvidia-2 missing in FILESDIR" + [ -f "${FILESDIR}/nvidia-2" ] || die "nvidia-2 missing in FILESDIR" sed -e 's:\${PACKAGE}:'${PF}':g' \ -e 's:VIDEOGID:'${VIDEOGROUP}':' "${FILESDIR}"/nvidia-2 > "${WORKDIR}"/nvidia insinto /etc/modules.d @@ -295,23 +262,6 @@ src_install() { # Taking nvidia-xconfig from nvidia-drivers to help config xorg.conf dobin usr/bin/nvidia-xconfig || die - - if use gtk; then - # nvidia-settings - dobin usr/bin/nvidia-settings || die - cd "${SETTINGS_DIR}" - insinto "/usr/$(get_libdir)" - doins src/libXNVCtrl/libXNVCtrl.a || die - insinto /usr/include/NVCtrl - doins src/libXNVCtrl/{NVCtrl,NVCtrlLib}.h || die - - # Install icon and .desktop entry - doicon "${FILESDIR}/nvidia-settings.png" || die "doicon" - domenu "${FILESDIR}/nvidia-settings.desktop" || die "domenu" - - doman doc/nvidia-settings.1 || die - dodoc doc/*.txt - fi } # Install nvidia library: @@ -343,9 +293,8 @@ src_install-libs() { local usrpkglibdir=usr/${pkglibdir} local libdir=usr/X11R6/${pkglibdir} - local modules=${libdir}/modules - local drvdir=${modules}/drivers - local extdir=${modules}/extensions + 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" @@ -397,8 +346,7 @@ src_install-libs() { if ! use x86-fbsd; then # Install the .la file for libtool, to prevent e.g. bug #176423 - [[ -f "${FILESDIR}"/libGL.la-r2 ]] \ - || die "libGL.la-r2 missing in FILESDIR" + [ -f "${FILESDIR}/libGL.la-r2" ] || die "libGL.la-r2 missing in FILESDIR" local ver1=$(get_version_component_range 1) local ver2=$(get_version_component_range 2) local ver3=$(get_version_component_range 3) @@ -426,8 +374,8 @@ src_install-libs() { /usr/${inslibdir}/libXvMCNVIDIA.so exeinto ${NV_ROOT}/extensions - [[ -f ${modules}/libnvidia-wfb.so.${sover} ]] && \ - newexe ${modules}/libnvidia-wfb.so.${sover} libwfb.so + [[ -f ${libdir}/modules/libnvidia-wfb.so.${sover} ]] && \ + newexe ${libdir}/modules/libnvidia-wfb.so.${sover} libwfb.so [[ -f ${extdir}/libglx.so.${sover} ]] && \ newexe ${extdir}/libglx.so.${sover} libglx.so |
