diff options
Diffstat (limited to 'x11-drivers')
14 files changed, 30 insertions, 3274 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index ab7f5880a4bb..14def0d2e61d 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for x11-drivers/ati-drivers # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.378 2015/04/08 09:38:30 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.379 2015/06/01 16:09:39 mgorny Exp $ + + 01 Jun 2015; Michał Górny <mgorny@gentoo.org> -ati-drivers-13.12.ebuild, + -ati-drivers-13.1_pre897.ebuild, -ati-drivers-13.4.ebuild, + -ati-drivers-13.9.ebuild, -files/ati-drivers-13.6-linux-3.10-proc.diff, + -files/ati-drivers-do_mmap.patch, + -files/ati-drivers-kernel-3.8-acpihandle.patch, + -files/ati-drivers-linux-3.13-acpi-handle.patch, + -files/ati-drivers-vm-reserverd.patch, + -files/check-for-iommu-only-if-iommu-is-supported.patch, + -files/linux-3.10-proc.diff, metadata.xml: + Remove lastrited versions along with unused patches *ati-drivers-15.1 (08 Apr 2015) diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index 3c447ca775df..324f72edbdf0 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -3,61 +3,46 @@ Hash: SHA256 AUX ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch 799 SHA256 0001fa7f2c3e15ec315f6c963dd428b682778c129250941a849577b8b3293e36 SHA512 a7ae5e7017c9b5a68d112d9a77df40ada722b06aff0cc31147713bfbce2419f9ca8c22b40398ab8b80c86427ff086a5617fb6de93d540af54365c7039cdcfe0f WHIRLPOOL 809c5bf8f0b0381af6a8549c36fcd00e75ff2f571f21cef3f2dec9ea823c65c29db28373b7145f39b9ed2cad234ec3c063407fb7a12260cfe1fe62eb67b5780d AUX ati-drivers-13.12-acpi.patch 548 SHA256 203fde1d773dfd16ab91cbecc9aad7d73a630a3c19f1feb3c74987284c385bff SHA512 1db52b5e4a6398d253122d4d3a3db2261396db9e07cecaf64c4edf1b6d8544cafe6dc0c24651de6b243728f8471f135c0c80c4958bb21cb0b6bf71cca7935981 WHIRLPOOL c7eadd81f517a2cb253c36d1ea401c367bbec88a4c7d14a399ce15c3a5c095fb7ed259d31ef8032304576d2921185e3b06aa1a89d7a209f58e3af93748e240c6 -AUX ati-drivers-13.6-linux-3.10-proc.diff 11837 SHA256 24edbb4fe0390d3eea4bf6b76b8bab87e26a5906cc3e273f2b87b8f3c5fc4918 SHA512 467b111e6c18a587c3d24c0460ce3797b82daf029c5f90614ab7e25e813011a54efc31f8364fe96b46bb28361be87cfe8e49a5ff73b5f23c4e8b072b83785c6c WHIRLPOOL de0d55658ef0f2123cc44928dd3e9d6b6f96223e6669bf38060c5bb50e4084433657708462f04db9ec60932135b6451054b52e962d203dc78f330a9ec48ef309 AUX ati-drivers-13.8-beta-include-seq_file.patch 623 SHA256 c5e91dbeea4458ec1e36b62bbf6ab71acb86b97542b76039dca1890cf3c7d3c7 SHA512 3dcb426b48f8abe7f82ca990293418f7944ab274f58c224b9a74f117be097289c85a131f2cfc3585a0caf7a71ec0968afc28f4b7b5b533d21bae51ab3e2c6234 WHIRLPOOL dfc6a63bb263809b15bbc2674d893383d4e144c48db023c1842f134bf95302452363af0a6a5088d76327786d094d086187e7abd28dd809b2619a0c01640cc536 -AUX ati-drivers-do_mmap.patch 1405 SHA256 3fc9bae50d25d3bfe76a3a1e89c8d025674a4cb9afd16d3a5d8b3c25a66f536d SHA512 1a2f8fe7f2506037d6d158e5c2efffa39c503566284d8f516cb2d84db546eced24df5dcb8d74ac84911589efb4547d7f8610d78ad29703f9ed0a9890576c51b7 WHIRLPOOL 86daa957d7569b26fdf92929e5b04a32379af067a208628eab1a4541fdebfb51fa4bfedeec63f4685c6258adcba2ddc4223b69dca329ecbebd4ba13167f66f82 -AUX ati-drivers-kernel-3.8-acpihandle.patch 859 SHA256 d0c3f7e8f9e0c7fbffbac9e483c1cc10ec883639233124faf06503faca371fb7 SHA512 9566b6357006fb783a494b9404b11e756913c03f39bd1e53f650dc16a17eeb63a0371db729646a42c412199933cadc4c9bd35aa26fdcdea3d706da2ff33122f3 WHIRLPOOL ccebd25e7686fb393cd880b6bb3d243635b71b36254b41628af71b1d610e70fec803d0818f7c19b08867294666a0b71641f7eaabf889f60b6e1b68cfcd24b3c0 -AUX ati-drivers-linux-3.13-acpi-handle.patch 1227 SHA256 fac8e8a85fdf598a35e880d1a8b10cda84597cfdbee8ac0e9aa667351bbefd24 SHA512 33ce6b9751444de93adec1bb8c99f8592692cdd0ba2b6577ec4978a35587d16f71131471ccded22548a0dd3f1d4afe9ea9c9c7de770fbdfe5f546dfd33979e63 WHIRLPOOL 6f1d537eff041ca8803294552271f2303b8d1ec18c4282c3e3b58c329534bf68889254a108c1b05325f6e95fac923e6b6d06fbb93fceba532d2b6af0044358cf -AUX ati-drivers-vm-reserverd.patch 408 SHA256 61128444938f94f911325b6cac810d3cb3614d0002758e48ba976b678414df30 SHA512 34cd4705f632b1493eac756538eb21fe0e090f78cf92cde7c2a7094a8fc8134ee6d5dd24c6bb9ad18c8ef46dd1d5505ae12d43032265cd4ade03793f277fe4c2 WHIRLPOOL 5a1a98145576b20bdd2e80e5f7f9a2b9bab02942a9fb83814d73d17f1bfec690ee0cd2ccfdf418f297e75432d8fcee8164a1d179eeb5bc716e1becf96bb373f1 AUX ati-drivers-x32_something_something.patch 486 SHA256 9eb114a797089fca3693420305a6b668c4d7a16a722d5faa53dd904bba1b4c07 SHA512 157884244a49748c897a2eca1a46bf40631042d15af85c2b2f49bc3c3c48f5638dec815a4e9c67ee2c8b88cc15b7f71e9fe4d9bfebf5444bb169542048f66499 WHIRLPOOL f7583d7df16c9eb608aff2330b4bd55ede34986e6f3cf63aa4cb2c77dcfade7c499f1b4cef95fdc8e6ab28d7bb5544a80703bcf5a41eae6b90ca8830b6fdd888 AUX ati-powermode-opt-path-3.patch 1471 SHA256 5cf36412d1ae757ab0db9a6949cf6fc10e0c37174ab1dee23eaae287f54629b3 SHA512 d72c387d926d9df16871109c39ff92f1cc94f1ccf4cc253bce115817003d890bc01ed8b831cd0b5ad589b887ac6bf0da740f97b84b79b77e833d4a3987d13e64 WHIRLPOOL 358d96a0882e2a69c83a0341f5017343c79de967b884507d0403d844d1d11ed4d6a9ab2ada24bccc4b2d835c61d20b6915703c9abf381d82b859658989af2092 AUX atieventsd.init 533 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3 SHA512 9f8990bb5619f99524e0759a1c4b41b0b2c081c6eecb3916ab60df8e6b59d99e3615af61e0ba5b71d003ccaaf41e2143237b26f36f64f00a47e0fe94f83473dd WHIRLPOOL 21979818a19bc27e3527958c66bf45654df4a307862897530bc02be6616f45ee210590a9d1bcab84336c6061482034010efbb251770bfaf023f20ffae8212ecd -AUX check-for-iommu-only-if-iommu-is-supported.patch 1003 SHA256 2bb6dbdd20231a917cb9b2882176c879316cba09eb0b54d95577f99ef9893c80 SHA512 195872c9afa0a3a4c72b6ca6569fb878d70cb147194e1ceb2f2d119756ad238d5c1dcdeced1b580e78592f8d316a399410599dc5804922a936710f24a54cacfd WHIRLPOOL fc57be4c8b663ac7811c2467fd966034be055dc4dc97c79b86c5fbe0a8671b755fad24e56a7a4295a80535160a3cbf93a3f8f14ffce2d21a70f1a7d7f9458416 AUX const-notifier-block.patch 878 SHA256 cd73f5e15d9521a989d8cd9b7e3b252406e7b89fdfc129fd2d470f0bc86e8457 SHA512 1b84cb85ce903d80ad50a0e2d53509016625d1ede070e18b800408d486dc89d5283d801d6449eb81ee25a7adffbd0094b57a301842364e1fb58cc6bf9623e5b4 WHIRLPOOL ee9785d250632cd8843a5995f36442ff6abec2d5a7158f3604a6bc147c7db251608b9484c3ac95376c4cc6b6a15f6682675bd011eb6a193a073ba873e17a9872 AUX fgl_glxgears-do-not-include-glATI.patch 361 SHA256 7f276c35b2c3dd2e588b7870bcee4994bc2d518ff35a7c9cfe50d13a877897f4 SHA512 6b9bd5af81508db21adcaa4684eec0062d0bf28fca8c7259dfca1994de9e6b521c2fa8f4519d038b1f40c4f36e7c8a4a29863bc5bd92483c5e1a039b06534da9 WHIRLPOOL 76113c89829bf1898c2e6411e94de55fd282fe836ab5c19ec288aec33dbd93a89472124bb3d978b57b2382d6d8769743bd1379836e3374375f5675cf0c10068a AUX fix-the-linux-3.17-no_hotplug-error.patch 556 SHA256 3b95e2b0b6af3e4d8c7d8e358760783d6d0c677fac97bcce5bed08896778148e SHA512 3b55ef70f0b221cf7025d159e40e725aed33f2c8ab4b85d50d777155493c82c38630aeb214ce904f1d08a07fbf143022d771fe474a37d5bd3fa523e71ca2c94a WHIRLPOOL 458fe67194a9f76e37b8bed7521c99c84d4f6a48688bf866cb3c142e3fa1df208cd6097bad85546857a3b2b79d29632ef23e12085e2a37b81d0301ef1151503f -AUX linux-3.10-proc.diff 9796 SHA256 a4201674067445369d5f1ed6f855a13481edfffcdce951b58c3bc23ef318ccc5 SHA512 8771604dda5a4ae77867bf5dfe966fc4c930ee7d6429d70ee30ab3a765b0fbb12f0201ab9a6049310a232d1314dc71578ae47d06af56d5b96c4454d427753e4e WHIRLPOOL 687f2275ddb61d39d70e3164bf042afe301c11c8e6baa03a211da07abad665cd91c1e023646c96aba435c9c5fdac19dc4c15be907af4c64ceaaaf025c72fa5cf AUX switchlibGL 1349 SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0 SHA512 51d2912aa6ec2002b096c0483be69650d682feec54486ed5226b91988bc1516f718c71d9f58a2b28e0dbc512c0300ea271f9a97885776dd045fe324f1549b85d WHIRLPOOL d335ea9c57a28f8450423089bbf798da77cc72fff6bad1221989412808abcd6bcb7afa41aa2b04231feff3dac6eaaff58a7595173e53b6cf0f5d3d591997b43d AUX typesafe-kuid.diff 927 SHA256 1791cdb3640509422d0c6770519cf896c0a0a8a85274c83cb3fa65ebe147366c SHA512 010a605f542d2fa328de8537420ae7dbba56b4075089baedd8d039c2dd271dbaaa4dadf29d6fc5c202ba0077d62f36982f867e2681e36f6bf36ce19b13bca252 WHIRLPOOL 0096d0b77c2eeb62761cccc9e012dfa3ddaf2d10bd3afaff6edf918d921b6e4ce5865e5857f24e23278fcaf37b66fec589e59012142fde9dd8112dd59a78df20 AUX use-kernel_fpu_begin.patch 521 SHA256 5b2af71806fb7aa57f03000762c09e74bef8905bba66477387173c51867695d2 SHA512 0969e7ef9d2d0c12b2a3aa074f43b5a525fa234cd8c9d2f85abf4f0c46b3dd7c4acdd2ed2f5aca6a2314e5db1d02f3c17c1b276b6bd181cd2725f72c24ddca5e WHIRLPOOL bd0e87c3ec2faf7f782ea0991db41cb63ae242564d3b0d278ea2ffd0bd27973f6f52d008cd3fbd45c61a88a9d9487f53f52229221454dc0b4d7714282e518b43 -DIST amd-catalyst-13.12-linux-x86.x86_64.zip 160571830 SHA256 024033f4847d1c2a182fc44e0b3df29b2d133e24aeaba390f4504a8f3361a0ca SHA512 bf02aea47dc0588e8fe6590ff5665b25b34b3e10499348e2eb786ba89b32703897753852e6ee8ed52c3d0f8eef46f2026d130329d7af75191e605975379d0109 WHIRLPOOL bcdac0f9641cfdc6d89cd5544fe22dda91f64ae8d34dcd25b55930702108b1bee1db0cdc85d8a68a78fddc34f7f30ab88c9813d3a6ba38b3abf37a24d6210707 -DIST amd-catalyst-13.4-linux-x86.x86_64.zip 122588023 SHA256 ebec78c7f78db3601d1c97116a6823076a7765318e16d88b619ebc80d4c6d1d5 SHA512 ce012f46527ee0073f658e97dd793954930b934b96be9e1c6cd1d344e7734ef81949b484701d5e7e1ebb221f46b5a617f4efb4445e42c06ac0a8b4eca76463fc WHIRLPOOL cb0f7af6d0474c3d521c5785bab49d76da7e09e1ddd02dc0e72b70b5afdb2bd1e07d4a4115a755f213718e7c32c816697d993b73706d58be68fa043aef1ad551 -DIST amd-catalyst-13.9-linux-x86.x86_64.zip 120482826 SHA256 ebade5062713c69d2b703b0a3f62defc409d58e98ceab3bfac7a71643c0c4cd3 SHA512 887c1146920ba7e5b31efd63b1a1b7d9cab586e8c6d705706e0b176b3527e542f452d919cd015c3a04d6f42c884f27d983b2a9229b70716129a94674dd7f62b4 WHIRLPOOL d8b6c7ed772898914c256674ae08a8b3d3054eb5bdfc2f00dc4c796a36b4654c3101410786adb54eaae44ff35386db2aa8d8db12d70805f8732d0709412bdbcc DIST amd-catalyst-14-4-rev2-linux-x86-x86-64-may6.zip 122875129 SHA256 93e213e5b182a0863aa926d1e3ab4498adc0e0007aac4fc14a3abae84bb170f5 SHA512 478419e5051423d490d98149dbb529104d6d36b84e84fa90ae028f0b266c6f2f034c1584f016781c689b558e83724571e5b0af640d9374dcfaedb1c025fa8dfc WHIRLPOOL fdfc6c3177d9e5076a2a2deb79955df069706485dab845d7a651e14597441621b326d0376d979405eca7017330cb3bcdd50fe35f6394d41a527d01c6819fbb71 DIST amd-catalyst-14-9-linux-x86-x86-64.zip 142129117 SHA256 f28af1970df92a423ce0fafda89e508b37af68dccefffacff4a712ebe619c07a SHA512 022c4b6660c586e6055c2a4f708ca8f37677dc99a32b00fb8fe0ef51981c872a3cae0014994f2b9d137df0b8e98b6ab9904af778d77a815b62a5d72404022bb9 WHIRLPOOL 455e03a580d52aec915dcb899eca019bc3ff265ef250dab65fb08549f77078b8014a93961adeae663f85538a6bc188b8f6b68f16cd7b32418ddbd5bdcf93ae12 DIST amd-catalyst-omega-14.12-linux-run-installers.zip 155616187 SHA256 68669836f20ad4351e08b13c5766c6b2ffc6b8cd2a37e9baf55779da32d3a249 SHA512 f87be6a56c03ca4aae3782668af8700d83c85872387753cf002ba4a0e0816fae9af29841a4390db972bfe2f7fb853571b32f8434c2008983461b80699347ac21 WHIRLPOOL 2675a387abd372b34c51f4e8ebfd6547300a8c3ffcc0562633838bc0cdaec3675ca3f4cfa2ab7481c8fa1238a46059f5f848611780638ef6d2301a527d900326 -DIST amd-driver-installer-catalyst-13.1-legacy-linux-x86.x86_64.zip 106908508 SHA256 3a992fb7564dba17a696217dc32043dabc21743c82116a6657817ee8a3a1d55f SHA512 96b34045dca3ad70156500b37d3f06008728ff81878a3e1432060d08e668d8cbd9bfe172440bcb818f01d731d39e3eeccc25396417993d2b9b8985b3b7dc7357 WHIRLPOOL f0e34ccb1a9dfe3cfd9e9c640c3d6ed97a4a3e892b65325a78045653b40d29a78427dc9092d8e14bee1a8ba603405ed9e8cd60188d5bc5e8c5eee03d66a8f25c DIST fglrx-installer_15.200.orig.tar.gz 202964824 SHA256 a4ad20d53f790d5105351a5627fadbf02fe4945582abf2b93a337b1bbaa0b033 SHA512 499fd955a170d8157a974acdee981ce0a444262465624bacea38a23421f9d80ce3481b20a0d0daa4469eba85a69ec9278026c127a2a1995f52573adc5b1808c7 WHIRLPOOL 00ccd79433499133367b669740b494de33ec9de17c2a45f3d1222ee8d8cb9c40d4ad8d7043a2593bb3e1fbc66a4f65a7fd756c61a40fdbc9cf9b6cb1d693e25f DIST linux-amd-catalyst-14.6-beta-v1.0-jul11.zip 127042528 SHA256 9786b8d695069ebe132d4c6ad8bd011688c28af3fa1a11c08589f38f1854a962 SHA512 029df9ff5ba1a90bb54518726852b20ba3766e3b72d1071d99dcee076dcc505e5d81433308f1213413257f4afe450fd3ca3fd29dc611fcc1126a8c148c928f73 WHIRLPOOL 26bd3eb371ac3dbefe539a4ebb31718db7153c2382b9e5f650de094be309964e65f1e55136313e4d5430ae18e661faa547bb6211efb1d6b3ca50487d99756195 DIST xvba-sdk-0.74-404001.tar.gz 583847 SHA256 731a2c489f2fb5d7318c1976061b26c1057a696f46d09dcf55fbada97fed17eb SHA512 aa1dd52b59eeeabd026d8b76e3b75eaf02587ef286438ba28884afeef5a5efaf50283b5ee4f5b81b12cf79cb4ec77c9a235a886b29fb7cdf850c9779f4b07b35 WHIRLPOOL 69917b746d353a884512e97b9d9a9b89e6f51add3119e69ddd119d51c0c3f2820b93a449fe42bd76d671dc505f92bf25b7f2c5868b33768fc68a19596e460951 -EBUILD ati-drivers-13.12.ebuild 20248 SHA256 d08ad91337acb95e1a71d08fce1b0effa17f4c55955dbe4539282bd76db39cd6 SHA512 05505cd10ec604b1064fa3d2399a78e73ef9e3918f32bc9926e45ebdd647fb771c3ff12d33ed29caed96781a11795ad1a0251b4d3c7b817b762e1693fb853208 WHIRLPOOL d0036b94acad31f989b996bb17d90df85c5d43a4443f5f4bffc1a66f8f674a5d122cfdb84c99aef46dbe07e9a1e267d7a31b25e969f4ecf355bdbe066564e19f -EBUILD ati-drivers-13.1_pre897.ebuild 20022 SHA256 1211a13b3cc08196820dfa2c24537af6f8e645442ec65956651d00176dca7851 SHA512 779f6079678e145dfa1c117479372f6abb683b1c66f6a9f25e40fd493a91823f58a72bfb31c29e58c25d28fb50ad363e66fb63551f8c70ab569dfa196db804c7 WHIRLPOOL 83409759defb8072202887d919976060ee4ba2394cceb86c73537c14adcf556a5bea56dd38a0cabb19ee22d5bcf5f7ebd173f4479915285feb89005c351c4183 -EBUILD ati-drivers-13.4.ebuild 20535 SHA256 eb21c2348dc93f9b5dbfcd12bba6e8e744b04c0433f17e483c35f2616dcbf85d SHA512 37ce1ab5a222335ea64f1c9d859af4f1d253993f1d46b9b5e695acdd5afbd66951bc318cc8b388a5ebae84f7f8cd4d93c74fa0d81731877e6a1d49ec1865cf5d WHIRLPOOL e0a1b5f4a725308a6693aadaabf429f39ccb0a128a6178217449f35beb6ab25b8a820d1afbe50fb3fb33816f178dfc72ad584df897e4ef7767fa93ff37ea5b92 -EBUILD ati-drivers-13.9.ebuild 19911 SHA256 53f299fb7f403804634e869d1b26cceb197f6a81dae2bb8a2ed060bbff4abe62 SHA512 47eb238d8acd8535d6bc64a65bb3f16d314f0cc379fece77c207ffb677030f9cbcf92d355f3a41870298eac56b36361508dc5fbe09c6936bad7f0fee593d4a57 WHIRLPOOL 486e36d56e2a10871dab46df7b48215703b96912529056c2fad0b766ee17f504e216f0ca3778f55db5eb1678eae97deeb8eb5a154a58d6cd4a174dbac205020c EBUILD ati-drivers-14.12-r2.ebuild 20118 SHA256 b1e97b792b5728a8a031ba664d05eb7eed9e5973a293f68c6b4a7a54042c2ee0 SHA512 c7f11d3e7f7925d8fa4818b720961c189b9710639e3fa3334e32b0080962bab099a88c51313623424a70cc17ca1b67f1f3eae2359a72aec3706193029b41bec3 WHIRLPOOL ead0542a1b67dab21f6b9aae82fc62e8616408568a5161079ff2a4423c7382c89d7794bf9629bbe16cf1359f8fbdd8112ded7872bfb0375669084da302e5a293 EBUILD ati-drivers-14.12-r3.ebuild 20309 SHA256 aa1900db616b9c75914c5492e9162f5caeb6b569a3074f744be238f0feb96608 SHA512 88207a2c73935f0cdde0ab3a0f19b91234e309a294cca69ef8d21df4245ddcef785f652aa70adc1a6599529ce98d432202c38dc8dbf2225a610baf087e681cf4 WHIRLPOOL 8f5414c9497f7d4c3e8d5af3721a27199bde5e89b89defe085cbec952a60164c1d95c966e880d814d34473dc90f93b3a66e70436074be9abb55fa89f46ad5337 EBUILD ati-drivers-14.4_p1.ebuild 20363 SHA256 73985d24521157d9b79e0764b3be26f0e285426f5536b8fa0e853431ab98875e SHA512 117d202e7b83a25ebb92ac7521c7d9d073016ba61b9eed5d1d476a53c826d2a722fd471e1842202596b6f3772b460796dc9f174bdc0fa17d1756ea74ca9d5f55 WHIRLPOOL 0e84c2f31a9a19ccd3c0103e7e7452c692349817472aa6f28b78adbd320c3a5e9863ccab729b6a4b0080c54dc1686def3c483398df28f3b64ff8ee4ff7b706c4 EBUILD ati-drivers-14.6_beta2.ebuild 20294 SHA256 7c532c53e269e6e6a5707634e95e07647b9916e86d301191c2a0793236dad2f2 SHA512 ce9be506525630b2748dfba243f296592d93b9c69c61b5d9105f0c7344cab1b97f780138d3ed84b9be97ff96c92426a0f08bac8e16cdae379401ba88afe75ddd WHIRLPOOL c0c7c523307548956a2dbee82a92462c132300b69940dc513c780d1384ec1c1081eb81b9935a48f03acb40e1671f770fe70f8541cb2bf4883868a7a21d6d74cf EBUILD ati-drivers-14.9-r2.ebuild 20055 SHA256 1afbc3d6315809ea71af19c0839c4939c525aaa66f9c9a5f8491842ac2f9eec7 SHA512 f564bd3455f0cf770a6849027feab5f26c1b513e2cd911c00daac01ca6d288653e993d0eaaae2837a17e2a5c24aa122292163f9b3bade79b5c125ff4c30a3788 WHIRLPOOL b7b83b57c7af951b5ab5047518f3134a09483ca1e91834521cb5ea1758351a85b60a7668d4141ec76aa51d2db68bce504e7b4c3ec0929df53dbfce774da173d3 EBUILD ati-drivers-15.1.ebuild 20574 SHA256 c8b03be04a7ab4e703885fa2c9ae3a6885be18776a47ac276a4ee52c14df3dce SHA512 5269ccfa2959e311339c05ac908b1322427508474991f20a079fa5ad4d2cf762fdf3ad15dcbb569b5d23e219d2dfbf331001b59c2a2cb3d68cf0c6e79def3b60 WHIRLPOOL cdd52dae6d7c9a629e61daaf32df70affdce3ce5cd78c39acac9f64ca6d7c0b6f05550d7ce8b121e04cd547f9394a4ba10bf0c11cf2054667702f91d3ffbaf13 -MISC ChangeLog 96725 SHA256 055119bc731de6ec63a98b040099a6061d312268461414893c7a867741705d48 SHA512 3d85a0534f0ef7dd061ead63f59b456a7c8453dbeaefb879ddef7077f67202e075392f1fe6acbb6cab87aedf0da4a0c3d9803b69395a112e3dafa81699d8c284 WHIRLPOOL 0cd7d9afe38acb3fcff3fde1871e976108746db3bc6cbb14e6ae7dcec195350540ab6ee53dfe4a3cc2ec5a0bb5758f66952bed9bba46e00d738be7a9f1f28757 -MISC metadata.xml 884 SHA256 db3e4c10a4f1d52fa8378134a4847be964ae5de857faaa16aca5d6ab484d431a SHA512 5828f6a84b136294e154f3f92188a33d5d728d0322768212ce6cf12907ea49654348f2214d2371510da787712583df12b1c3bd03a90d861f1b41d65c2ad0ff4a WHIRLPOOL 266cfdd88c68ea9cd70fb28872dd91f9c0e4e542fd236c4aad3a694cf68b884585d213b902daaf886662de8bdd91d9620b3b7d6a4fe485b8f408f34e00605b29 +MISC ChangeLog 97272 SHA256 bb744fac8a2172bd4909647ee0ae6709ef4748e4bcccd6a5336e5efbe1493233 SHA512 d8d6cdf7cccec61efe7067ca501b89e1f95a168761c5e076b4e62f36511d01cc90a9a0d258ff09d9c27256dfd08f805d394b2d93de5eaee654cc23173c378972 WHIRLPOOL 2f8fc8c15f465adc3911223256d10baea48bf781f7741c15077a71c5ef7031315b8e27810dc6942007f89ab1e31a675e2eff057da21138f26b20a490c3037db9 +MISC metadata.xml 770 SHA256 ff0388f176ac349ff17ab7f038fd23359009cf6b683e40f699cb75db04536116 SHA512 df8e43ab42b2e24d83b64d593ee539c12f93d8070cee6e3f0af6a09d2b5d988ef93ece9be0e30ae984500aae45ae28dbba08e13a07ec42895f153a8a14832271 WHIRLPOOL 882ac84772b2e79d09487b3e857429d5692641e8fddd0e8bc8c2427668a00577cda34d6113c783c4435c6f0b26aabb332b03ef55d9b50dbfc0671c38437b1437 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 +Version: GnuPG v2 -iQJ8BAEBCABmBQJVJPf3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy -MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRGmQP/AlkXtbHhTprYZWFHz5BHwwq -vQRmBT+IEy+VinpxWNQYw0mTkQxFdOAlrPrLN5az633l5pql/nbNJQUmzFQzl6/a -hqcxIxuX64S2lyd1dSsAjiJnMM7qW7KaiRg1Nofe6fcB/30J2v/+a3TP+h9ffBuF -nwWQZsK2sL1s7IPaulTie6ens3MU1Iibp1yYqUFGDL6vtJTDFu3GYUnlxj+ms1nl -HF1KmrybAW2w4vj4eHZUDoE/IlDoQxqsh1IU2UxxpITmu/hAvDZD8m4UUt9Y2uom -oZ1BbPxusTg2ERrSiDcFxLBXuSmCT5lJFHN3NQ5kJM30q5E1rayLBv+WUj3hEmKf -nqOWVXiUoUHLEgmVfp21m1ip++Af4ROetZd4xJRlTGIwFsQj+pPSNsfZpJvWIzhS -cdM9S+stTcrtw+sCs7+d5mYwWH9dwe+xG8Q6gBlVBlDZaEuosfjEkVv3ei15CibQ -MLrcFh9BUzXYuab5HX8Y+YzB7wAfsW2vipntU2YSXN+T9gJlsX9Xq+lAUxq+ZAFO -5n1e3F0ddoadi/EljjhhRvVRtg38y+sf0eeF6XFTww+vNf+0fuCHvS+Gk8kmAhpt -H2rD8OdKyojsjY/SpkRGp5G5cBqhBKZWHqLQW3YatKFj66VHc/l7u+2qORLJOmyj -/0t0YW051i/JqHglLFEK -=ZRm0 +iQJ8BAEBCABmBQJVbIPEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOtWcQAJvB5Opiaq8b3gQADL4Vd+E0 +iIpoNytD/6HWAa+k1b27Zh4OpWXqp9gDj468/lx9GR3CtSFsMpapgjNtSYPYkVaj +4iLeSH+Xqu4kkQsttZIq097RnP8il4xSf+ZUVia7kN2pYIqZI58C4TDcsgi7SmDs +OisGN2bxeIWHGbTlPFO9ixjjjcevv+u8ugFsmiyPDxC4KOJBE0gAM9pdLoFZQyTO +WTQTOSS02Xlte8S141NIYZcFQrrPPp8qaPwvCuz1CjQV7zUB8OixPeLm/Ca5pk/O +IG8yeLRp1bSovmQe2GLbjvB/Y50bw5j2DrZmf+VXhVUQhfX/e2+Lsw8B9rsw5mUs +cWfQalLJyli5Y3JHqWwb2TE9np9eW+Uuuy4c/aYZ1T9OraSYoIqN4udxV5Vi3YhJ +9VRJqggw1X/nnrZeRT28WCv9kAWHrR4TVZ56vcBys53Yj7NS0UXt0evpYVqj335d +caIBbzyQC3ulvlHXMQ6A6Q4FFizVD3VfoOnGHlTdf+IN8JdSJG31Bv6x14hv9avr +Vb3Jka1EIVxqzWc45Cvjs0tn0SJhgqgURxIar+yPHEAo6DP4GsI59LO/o2Tpt/Or +Zvkmqf6e6C93JCMbw7zJ1hyAgBrkm+I3WLDvHV/lucsFFPGpDp6G1oCAJmhX4isz +Ceje4pOCP4vT/auz4BOl +=ODTJ -----END PGP SIGNATURE----- diff --git a/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild deleted file mode 100644 index 003583a6557a..000000000000 --- a/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild +++ /dev/null @@ -1,612 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.12.ebuild,v 1.6 2015/03/31 18:10:48 ulm Exp $ - -EAPI=5 - -inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-utils - -DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets" -HOMEPAGE="http://www.amd.com" -#RUN="${WORKDIR}/amd-catalyst-13.11-beta1-linux-x86.x86_64.run" -SLOT="1" -# Uses javascript for download YESSSS -#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip" -DRIVERS_URI="http://dev.gentooexperimental.org/~scarabeus/amd-catalyst-13.12-linux-x86.x86_64.zip" -XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz" -SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}" -FOLDER_PREFIX="common/" -IUSE="debug +modules multilib qt4 static-libs pax_kernel" - -LICENSE="AMD GPL-2 QPL-1.0" -KEYWORDS="-* amd64 x86" - -RESTRICT="bindist test" - -RDEPEND=" - <=x11-base/xorg-server-1.14.49[-minimal] - >=app-eselect/eselect-opengl-1.0.7 - app-eselect/eselect-opencl - sys-power/acpid - x11-apps/xauth - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - virtual/glu - multilib? ( - app-emulation/emul-linux-x86-opengl - || ( - ( - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXrender-0.9.8[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) - ) - qt4? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXxf86vm - dev-qt/qtcore:4 - dev-qt/qtgui:4[accessibility] - ) -" -if [[ legacy != ${SLOT} ]]; then - RDEPEND="${RDEPEND} - !x11-drivers/ati-drivers:legacy" -else - RDEPEND="${RDEPEND} - !x11-drivers/ati-drivers:1" -fi - -DEPEND="${RDEPEND} - x11-proto/inputproto - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - x11-proto/xineramaproto - x11-libs/libXtst - sys-apps/findutils - app-misc/pax-utils - app-arch/unzip -" - -EMULTILIB_PKG="true" - -S="${WORKDIR}" - -# QA Silencing -QA_TEXTRELS=" - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/libatiadlxx.so - usr/lib*/xorg/modules/glesx.so - usr/lib*/libaticaldd.so - usr/lib*/dri/fglrx_dri.so -" - -QA_EXECSTACK=" - opt/bin/atiode - opt/bin/amdcccle - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/dri/fglrx_dri.so -" - -QA_WX_LOAD=" - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/dri/fglrx_dri.so -" - -QA_PRESTRIPPED=" - usr/lib\(32\|64\)\?/libXvBAW.so.1.0 - usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 - usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so - usr/lib\(32\|64\)\?/xorg/modules/glesx.so - usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/dri/fglrx_dri.so -" - -QA_SONAME=" - usr/lib\(32\|64\)\?/libatiadlxx.so - usr/lib\(32\|64\)\?/libaticalcl.so - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/libaticalrt.so - usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so -" - -QA_DT_HASH=" - opt/bin/amdcccle - opt/bin/aticonfig - opt/bin/atiodcli - opt/bin/atiode - opt/bin/clinfo - opt/bin/fglrxinfo - opt/sbin/atieventsd - opt/sbin/amdnotifyui - usr/lib\(32\|64\)\?/libaticalcl.so - usr/lib\(32\|64\)\?/libaticalrt.so - usr/lib\(32\|64\)\?/libatiuki.so.1.0 - usr/lib\(32\|64\)\?/libatiadlxx.so - usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0 - usr/lib\(32\|64\)\?/libXvBAW.so.1.0 - usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 - usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so - usr/lib\(32\|64\)\?/xorg/modules/glesx.so - usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so - usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/dri/fglrx_dri.so - usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so - usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so - usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2 - usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 - usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so - usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 -" - -pkg_pretend() { - local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" - use amd64 && CONFIG_CHECK+=" COMPAT" - - local ERROR_MTRR="CONFIG_MTRR required for direct rendering." - local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct - rendering to work." - local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire - as GPL-only. This prevents ${P} from compiling with an error like this: - FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'" - local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause - kernel to reject loading the fglrx module with - \"ERROR: could not insert 'fglrx': Exec format error.\" - You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead." - local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38." - - # workaround until bug 365543 is solved - if use modules; then - linux-info_pkg_setup - require_configured_kernel - kernel_is ge 2 6 37 && kernel_is le 2 6 38 && CONFIG_CHECK+=" BKL" - check_extra_config - if ! linux_chkconfig_present AGP && \ - ! linux_chkconfig_present PCIEPORTBUS; then - ewarn "You don't have AGP and/or PCIe support enabled in the kernel" - ewarn "Direct rendering will not work." - fi - fi - - if ! has XT ${PAX_MARKINGS} && use pax_kernel; then - ewarn "You have disabled xattr pax markings for portage." - ewarn "This will likely cause programs using ati-drivers provided" - ewarn "libraries to be killed kernel." - fi -} - -pkg_setup() { - if use modules; then - MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)" - BUILD_TARGETS="kmod_build" - linux-mod_pkg_setup - BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}" - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\"" - if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space" - else - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space" - fi - fi - # Define module dir. - MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod" - # get the xorg-server version and set BASE_DIR for that - BASE_DIR="${S}/xpic" - - # amd64/x86 - if use amd64 ; then - MY_BASE_DIR="${BASE_DIR}_64a" - PKG_LIBDIR=lib64 - ARCH_DIR="${S}/arch/x86_64" - else - MY_BASE_DIR="${BASE_DIR}" - PKG_LIBDIR=lib - ARCH_DIR="${S}/arch/x86" - fi - - elog - elog "Please note that this driver only supports graphic cards based on" - elog "Evergreen chipset and newer." - elog "This includes the AMD Radeon HD 5400+ series at this moment." - elog - elog "If your card is older then use ${CATEGORY}/xf86-video-ati" - elog "For migration informations please refer to:" - elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml" - einfo -} - -src_unpack() { - local DRIVERS_DISTFILE XVBA_SDK_DISTFILE - DRIVERS_DISTFILE=${DRIVERS_URI##*/} - XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/} - - if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then - unpack ${DRIVERS_DISTFILE} - else - #please note, RUN may be insanely assigned at top near SRC_URI - if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then - unpack ${DRIVERS_DISTFILE} - [[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}" - else - RUN="${DISTDIR}/${DRIVERS_DISTFILE}" - fi - sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die - fi - - mkdir xvba_sdk - cd xvba_sdk - unpack ${XVBA_SDK_DISTFILE} - - mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed" - cd "${WORKDIR}/extra" - tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz" -} - -src_prepare() { - if use modules; then - if use debug; then - sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \ - "${MODULE_DIR}/firegl_public.c" \ - || die "Failed to enable debug output." - fi - fi - - # These are the userspace utilities that we also have source for. - # We rebuild these later. - rm \ - "${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \ - || die "bin rm failed" - - # in this version amdcccle isn't static, thus we depend on qt4 - use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle - - # ACPI fixups - sed -i \ - -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \ - -e "s:/var/lib/gdm/:/var/gdm/:" \ - "${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \ - || die "ACPI fixups failed." - - # Since "who" is in coreutils, we're using that one instead of "finger". - sed -i -e 's:finger:who:' \ - "${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \ - || die "Replacing 'finger' with 'who' failed." - # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and - # add function to detect default state. - epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch - - # see http://ati.cchtml.com/show_bug.cgi?id=495 - #epatch "${FILESDIR}"/ati-drivers-old_rsp.patch - # first hunk applied upstream second (x32 related) was not - epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch - - # compile fix for AGP-less kernel, bug #435322 - epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch - - # Compile fix for kernel typesafe uid types #469160 - epatch "${FILESDIR}/typesafe-kuid.diff" - - epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch" - - epatch "${FILESDIR}/check-for-iommu-only-if-iommu-is-supported.patch" - - # Fix #483400 - epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch" - - # Fix build on new kernels - epatch "${FILESDIR}/ati-drivers-13.12-acpi.patch" - - # Add support for linux-3.13. See #498766 - epatch "${FILESDIR}/ati-drivers-linux-3.13-acpi-handle.patch" - - # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870 - use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch" - - cd "${MODULE_DIR}" - - # bugged fglrx build system, this file should be copied by hand - cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x - - convert_to_m 2.6.x/Makefile || die "convert_to_m failed" - - # When built with ati's make.sh it defines a bunch of macros if - # certain .config values are set, falling back to less reliable - # detection methods if linux/autoconf.h is not available. We - # simply use the linux/autoconf.h settings directly, bypassing the - # detection script. - sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed" - sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \ - || die "MODVERSIONS sed failed" -} - -src_compile() { - use modules && linux-mod_src_compile - - ebegin "Building fgl_glxgears" - cd "${S}"/extra/fgl_glxgears - # These extra libs/utils either have an Imakefile that does not - # work very well without tweaking or a Makefile ignoring CFLAGS - # and the like. We bypass those. - # The -DUSE_GLU is needed to compile using nvidia headers - # according to a comment in ati-drivers-extra-8.33.6.ebuild. - "$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ - -I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \ - -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed" - eend $? -} - -src_install() { - use modules && linux-mod_src_install - - # We can do two things here, and neither of them is very nice. - - # For direct rendering libGL has to be able to load one or more - # dri modules (files ending in _dri.so, like fglrx_dri.so). - # Gentoo's mesa looks for these files in the location specified by - # LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded - # location /usr/$(get_libdir)/dri. Ati's libGL does the same - # thing, but the hardcoded location is /usr/X11R6/lib/modules/dri - # on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64 - # 64bit. So we can either put the .so files in that (unusual, - # compared to "normal" mesa libGL) location or set - # LIBGL_DRIVERS_PATH. We currently do the latter. See also bug - # 101539. - - # The problem with this approach is that LIBGL_DRIVERS_PATH - # *overrides* the default hardcoded location, it does not extend - # it. So if ati-drivers is merged but a non-ati libGL is selected - # and its hardcoded path does not match our LIBGL_DRIVERS_PATH - # (because it changed in a newer mesa or because it was compiled - # for a different set of multilib abis than we are) stuff breaks. - - # We create one file per ABI to work with "native" multilib, see - # below. - - echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep" - doenvd "${T}/03ati-colon-sep" || die - - # All libraries that we have a 32 bit and 64 bit version of on - # amd64 are installed in src_install-libs. Everything else - # (including libraries only available in native 64bit on amd64) - # goes in here. - - # There used to be some code here that tried to detect running - # under a "native multilib" portage ((precursor of) - # http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it - # should just work (only doing some duplicate work). --marienz - if has_multilib_profile; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - # This is sorted by the order the files occur in the source tree. - - # X modules. - exeinto /usr/$(get_libdir)/xorg/modules/drivers - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so - exeinto /usr/$(get_libdir)/xorg/modules/linux - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so - exeinto /usr/$(get_libdir)/xorg/modules - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so} - - # Arch-specific files. - # (s)bin. - into /opt - dosbin "${ARCH_DIR}"/usr/sbin/atieventsd - use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui - dobin "${ARCH_DIR}"/usr/bin/clinfo - # We cleaned out the compilable stuff in src_unpack - dobin "${ARCH_DIR}"/usr/X11R6/bin/* - - # Common files. - # etc. - insinto /etc/ati - exeinto /etc/ati - # Everything except for the authatieventsd.sh script. - doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default} - doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh - - # include. - insinto /usr - doins -r ${FOLDER_PREFIX}usr/include - insinto /usr/include/X11/extensions - - # Just the atigetsysteminfo.sh script. - into /usr - dosbin ${FOLDER_PREFIX}usr/sbin/* - - # data files for the control panel. - if use qt4 ; then - insinto /usr/share - doins -r ${FOLDER_PREFIX}usr/share/ati - insinto /usr/share/pixmaps - doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm - make_desktop_entry amdcccle 'AMD Catalyst Control Center' \ - ccc_large System - fi - - # doc. - dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx - - doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8 - - pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null - - exeinto /etc/acpi - doexe ati-powermode.sh - insinto /etc/acpi/events - doins events/* - - popd > /dev/null - - # Done with the "source" tree. Install tools we rebuilt: - dobin extra/fgl_glxgears/fgl_glxgears - newdoc extra/fgl_glxgears/README README.fgl_glxgears - - # Gentoo-specific stuff: - newinitd "${FILESDIR}"/atieventsd.init atieventsd - echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf - newconfd "${T}"/atieventsd.conf atieventsd - - # PowerXpress stuff - exeinto /usr/$(get_libdir)/fglrx - doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed" - cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx - doexe "${T}"/switchlibglx || die "doexe switchlibglx failed" -} - -src_install-libs() { - if [[ "${ABI}" == "amd64" ]]; then - local EX_BASE_DIR="${BASE_DIR}_64a" - local pkglibdir=lib64 - local MY_ARCH_DIR="${S}/arch/x86_64" - local oclsuffix=64 - else - local EX_BASE_DIR="${BASE_DIR}" - local pkglibdir=lib - local MY_ARCH_DIR="${S}/arch/x86" - local oclsuffix=32 - fi - einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system" - - local ATI_ROOT=/usr/$(get_libdir)/opengl/ati - # To make sure we do not miss a spot when these change. - local libmajor=1 libminor=2 - local libver=${libmajor}.${libminor} - - # The GLX libraries - # (yes, this really is "lib" even on amd64/multilib --marienz) - exeinto ${ATI_ROOT}/lib - newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \ - libGL.so.${libver} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so - - exeinto ${ATI_ROOT}/extensions - doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so - mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so - - # other libs - exeinto /usr/$(get_libdir) - # Everything except for the libGL.so installed some row above - doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \ - -maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*') - insinto /usr/$(get_libdir) - doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \ - -maxdepth 1 -type f -not -name '*.so*') - - # DRI modules, installed into the path used by recent versions of mesa. - exeinto /usr/$(get_libdir)/dri - doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so - - # AMD Cal and OpenCL libraries - exeinto /usr/$(get_libdir)/OpenCL/vendors/amd - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so* - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so* - dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so - exeinto /usr/$(get_libdir) - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* - - # OpenCL vendor files - insinto /etc/OpenCL/vendors/ - cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF - /usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so - EOF - doins "${T}"/amdocl${oclsuffix}.icd - - local envname="${T}"/04ati-dri-path - if [[ -n ${ABI} ]]; then - envname="${envname}-${ABI}" - fi - echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}" - doenvd "${envname}" - - # Silence the QA notice by creating missing soname symlinks - for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9]) - do - local soname=${so##*/} - local soname_one=${soname%.[0-9]} - local soname_zero=${soname_one%.[0-9]} - dosym ${soname} /usr/$(get_libdir)/${soname_one} - dosym ${soname_one} /usr/$(get_libdir)/${soname_zero} - done - - # See https://bugs.gentoo.org/show_bug.cgi?id=443466 - dodir /etc/revdep-rebuild/ - echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers" - - #remove static libs if not wanted - use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a - - #install xvba sdk headers - doheader xvba_sdk/include/amdxvba.h - - if use pax_kernel; then - pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed" - fi -} - -pkg_postinst() { - elog "To switch to AMD OpenGL, run \"eselect opengl set ati\"" - elog "To change your xorg.conf you can use the bundled \"aticonfig\"" - elog - elog "If you experience unexplained segmentation faults and kernel crashes" - elog "with this driver and multi-threaded applications such as wine," - elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2." - elog - elog "Fully rebooting the system after an ${PN} update is recommended" - elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg" - elog "might not work" - elog - elog "Some cards need acpid running to handle events" - elog "Please add it to boot runlevel with rc-update add acpid boot" - elog - - use modules && linux-mod_pkg_postinst - "${ROOT}"/usr/bin/eselect opengl set --use-old ati - "${ROOT}"/usr/bin/eselect opencl set --use-old amd - - if has_version "x11-drivers/xf86-video-intel[sna]"; then - ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server" - ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience" - ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or" - ewarn "try disabling sna for xf86-video-intel." - ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000" - fi - - if use pax_kernel; then - ewarn "Please run \"revdep-pax -s libGL.so.1 -me\" after installation and" - ewarn "after you have run \"eselect opengl set ati\". Executacle" - ewarn "revdep-pax is part of package sys-apps/elfix." - fi -} - -pkg_preinst() { - use modules && linux-mod_pkg_preinst -} - -pkg_prerm() { - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} - -pkg_postrm() { - use modules && linux-mod_pkg_postrm - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} diff --git a/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild deleted file mode 100644 index 3b7b52533b83..000000000000 --- a/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild +++ /dev/null @@ -1,611 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.1_pre897.ebuild,v 1.11 2015/03/31 18:10:48 ulm Exp $ - -EAPI=5 - -inherit eutils multilib linux-info linux-mod toolchain-funcs versionator - -DESCRIPTION="Ati precompiled drivers for legacy Radeon R600 (HD2000 Series) and newer chipsets" -HOMEPAGE="http://www.amd.com" -MY_V=( $(get_version_components) ) -#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run" -SLOT="legacy" -if [[ legacy != ${SLOT} ]]; then - DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${PV}-linux-x86.x86_64.zip" -else - DRIVERS_URI="http://www2.ati.com/drivers/legacy/amd-driver-installer-catalyst-$(get_version_component_range 1-2)-legacy-linux-x86.x86_64.zip" -fi -XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz" -SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}" -FOLDER_PREFIX="common/" -IUSE="debug +modules multilib qt4 static-libs disable-watermark pax_kernel" - -LICENSE="AMD GPL-2 QPL-1.0" -KEYWORDS="-* amd64 x86" - -RESTRICT="bindist test" - -RDEPEND=" - <=x11-base/xorg-server-1.12.49[-minimal] - >=app-eselect/eselect-opengl-1.0.7 - app-eselect/eselect-opencl - sys-power/acpid - x11-apps/xauth - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - virtual/glu - multilib? ( - app-emulation/emul-linux-x86-opengl - || ( - ( - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXrender-0.9.8[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) - ) - qt4? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXxf86vm - dev-qt/qtcore:4 - dev-qt/qtgui:4[accessibility] - ) -" -if [[ legacy != ${SLOT} ]]; then - RDEPEND="${RDEPEND} - !x11-drivers/ati-drivers:legacy" -else - RDEPEND="${RDEPEND} - !x11-drivers/ati-drivers:1" -fi - -DEPEND="${RDEPEND} - x11-proto/inputproto - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - x11-proto/xineramaproto - x11-libs/libXtst - sys-apps/findutils - app-misc/pax-utils - app-arch/unzip -" - -EMULTILIB_PKG="true" - -S="${WORKDIR}" - -# QA Silencing -QA_TEXTRELS=" - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/libatiadlxx.so - usr/lib*/xorg/modules/glesx.so - usr/lib*/libaticaldd.so - usr/lib*/dri/fglrx_dri.so -" - -QA_EXECSTACK=" - opt/bin/atiode - opt/bin/amdcccle - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/dri/fglrx_dri.so -" - -QA_WX_LOAD=" - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/dri/fglrx_dri.so -" - -QA_PRESTRIPPED=" - usr/lib\(32\|64\)\?/libXvBAW.so.1.0 - usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 - usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so - usr/lib\(32\|64\)\?/xorg/modules/glesx.so - usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/dri/fglrx_dri.so -" - -QA_SONAME=" - usr/lib\(32\|64\)\?/libatiadlxx.so - usr/lib\(32\|64\)\?/libaticalcl.so - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/libaticalrt.so - usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so -" - -QA_DT_HASH=" - opt/bin/amdcccle - opt/bin/aticonfig - opt/bin/atiodcli - opt/bin/atiode - opt/bin/clinfo - opt/bin/fglrxinfo - opt/sbin/atieventsd - opt/sbin/amdnotifyui - usr/lib\(32\|64\)\?/libaticalcl.so - usr/lib\(32\|64\)\?/libaticalrt.so - usr/lib\(32\|64\)\?/libatiuki.so.1.0 - usr/lib\(32\|64\)\?/libatiadlxx.so - usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0 - usr/lib\(32\|64\)\?/libXvBAW.so.1.0 - usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 - usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so - usr/lib\(32\|64\)\?/xorg/modules/glesx.so - usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so - usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/dri/fglrx_dri.so - usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so - usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so - usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2 - usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 - usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so - usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 -" - -CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP" -use amd64 && CONFIG_CHECK="${CONFIG_CHECK} COMPAT" -ERROR_MTRR="CONFIG_MTRR required for direct rendering." -ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module for direct - rendering." -ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire - as GPL-only. This prevents ${P} from compiling with an error like this: - FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'" - -_check_kernel_config() { - if ! linux_chkconfig_present AGP && \ - ! linux_chkconfig_present PCIEPORTBUS; then - ewarn "You don't have AGP and/or PCIe support enabled in the kernel" - ewarn "Direct rendering will not work." - fi - - kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then - die "CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38." - fi -} - -pkg_pretend() { - # workaround until bug 365543 is solved - if use modules; then - linux-info_pkg_setup - require_configured_kernel - _check_kernel_config - fi -} - -pkg_setup() { - if use modules; then - MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)" - BUILD_TARGETS="kmod_build" - linux-mod_pkg_setup - BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}" - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\"" - if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space" - else - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space" - fi - fi - # Define module dir. - MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod" - # get the xorg-server version and set BASE_DIR for that - BASE_DIR="${S}/xpic" - - # amd64/x86 - if use amd64 ; then - MY_BASE_DIR="${BASE_DIR}_64a" - PKG_LIBDIR=lib64 - ARCH_DIR="${S}/arch/x86_64" - else - MY_BASE_DIR="${BASE_DIR}" - PKG_LIBDIR=lib - ARCH_DIR="${S}/arch/x86" - fi - - elog - elog "Please note that this driver only supports graphic cards based on" - elog "Evergreen chipset and newer." - elog "This includes the AMD Radeon HD 5400+ series at this moment." - elog - elog "If your card is older then use ${CATEGORY}/xf86-video-ati" - elog "For migration informations please refer to:" - elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml" - einfo -} - -src_unpack() { - local DRIVERS_DISTFILE XVBA_SDK_DISTFILE - DRIVERS_DISTFILE=${DRIVERS_URI##*/} - XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/} - - if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then - unpack ${DRIVERS_DISTFILE} - else - #please note, RUN may be insanely assigned at top near SRC_URI - if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then - unpack ${DRIVERS_DISTFILE} - [[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}" - else - RUN="${DISTDIR}/${DRIVERS_DISTFILE}" - fi - sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die - fi - - mkdir xvba_sdk - cd xvba_sdk - unpack ${XVBA_SDK_DISTFILE} -} - -src_prepare() { - if use modules; then - if use debug; then - sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \ - "${MODULE_DIR}/firegl_public.c" \ - || die "Failed to enable debug output." - fi - fi - - # These are the userspace utilities that we also have source for. - # We rebuild these later. - rm \ - "${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \ - || die "bin rm failed" - - # in this version amdcccle isn't static, thus we depend on qt4 - use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle - - # ACPI fixups - sed -i \ - -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \ - -e "s:/var/lib/gdm/:/var/gdm/:" \ - "${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \ - || die "ACPI fixups failed." - - # Since "who" is in coreutils, we're using that one instead of "finger". - sed -i -e 's:finger:who:' \ - "${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \ - || die "Replacing 'finger' with 'who' failed." - # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and - # add function to detect default state. - epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch - - # see http://ati.cchtml.com/show_bug.cgi?id=495 - #epatch "${FILESDIR}"/ati-drivers-old_rsp.patch - # first hunk applied upstream second (x32 related) was not - epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch - - #fixes bug #420751 - epatch "${FILESDIR}"/ati-drivers-do_mmap.patch - - # compile fix for linux-3.7 - # https://bugs.gentoo.org/show_bug.cgi?id=438516 - epatch "${FILESDIR}/ati-drivers-vm-reserverd.patch" - - # compile fix for AGP-less kernel, bug #435322 - epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch - - # Use ACPI_DEVICE_HANDLE wrapper to make driver build on linux-3.8 - # see https://bugs.gentoo.org/show_bug.cgi?id=448216 - epatch "${FILESDIR}/ati-drivers-kernel-3.8-acpihandle.patch" - - # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870 - use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch" - - # Compile fix for kernel typesafe uid types #469160 - epatch "${FILESDIR}/typesafe-kuid.diff" - - epatch "${FILESDIR}/linux-3.10-proc.diff" - - cd "${MODULE_DIR}" - - # bugged fglrx build system, this file should be copied by hand - cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x - - convert_to_m 2.6.x/Makefile || die "convert_to_m failed" - - # When built with ati's make.sh it defines a bunch of macros if - # certain .config values are set, falling back to less reliable - # detection methods if linux/autoconf.h is not available. We - # simply use the linux/autoconf.h settings directly, bypassing the - # detection script. - sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed" - sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \ - || die "MODVERSIONS sed failed" - cd "${S}" - - mkdir extra || die "mkdir extra failed" - cd extra - unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz - - # Get rid of watermark. Oldest known reference: - # http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark - if use disable-watermark; then - ebegin "Disabling watermark" - driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so - for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do - sed -i "s/${x/x5b/\x5b}/\x90\x90\x90\x90\x90/g" ${driver} || break 1 - done - eend $? || die "Disabling watermark failed" - fi -} - -src_compile() { - use modules && linux-mod_src_compile - - ebegin "Building fgl_glxgears" - cd "${S}"/extra/fgl_glxgears - # These extra libs/utils either have an Imakefile that does not - # work very well without tweaking or a Makefile ignoring CFLAGS - # and the like. We bypass those. - # The -DUSE_GLU is needed to compile using nvidia headers - # according to a comment in ati-drivers-extra-8.33.6.ebuild. - "$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ - -I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \ - -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed" - eend $? -} - -src_install() { - use modules && linux-mod_src_install - - # We can do two things here, and neither of them is very nice. - - # For direct rendering libGL has to be able to load one or more - # dri modules (files ending in _dri.so, like fglrx_dri.so). - # Gentoo's mesa looks for these files in the location specified by - # LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded - # location /usr/$(get_libdir)/dri. Ati's libGL does the same - # thing, but the hardcoded location is /usr/X11R6/lib/modules/dri - # on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64 - # 64bit. So we can either put the .so files in that (unusual, - # compared to "normal" mesa libGL) location or set - # LIBGL_DRIVERS_PATH. We currently do the latter. See also bug - # 101539. - - # The problem with this approach is that LIBGL_DRIVERS_PATH - # *overrides* the default hardcoded location, it does not extend - # it. So if ati-drivers is merged but a non-ati libGL is selected - # and its hardcoded path does not match our LIBGL_DRIVERS_PATH - # (because it changed in a newer mesa or because it was compiled - # for a different set of multilib abis than we are) stuff breaks. - - # We create one file per ABI to work with "native" multilib, see - # below. - - echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep" - doenvd "${T}/03ati-colon-sep" || die - - # All libraries that we have a 32 bit and 64 bit version of on - # amd64 are installed in src_install-libs. Everything else - # (including libraries only available in native 64bit on amd64) - # goes in here. - - # There used to be some code here that tried to detect running - # under a "native multilib" portage ((precursor of) - # http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it - # should just work (only doing some duplicate work). --marienz - if has_multilib_profile; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - # This is sorted by the order the files occur in the source tree. - - # X modules. - exeinto /usr/$(get_libdir)/xorg/modules/drivers - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so - exeinto /usr/$(get_libdir)/xorg/modules/linux - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so - exeinto /usr/$(get_libdir)/xorg/modules - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so} - - # Arch-specific files. - # (s)bin. - into /opt - dosbin "${ARCH_DIR}"/usr/sbin/atieventsd - use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui - dobin "${ARCH_DIR}"/usr/bin/clinfo - # We cleaned out the compilable stuff in src_unpack - dobin "${ARCH_DIR}"/usr/X11R6/bin/* - - # Common files. - # etc. - insinto /etc/ati - exeinto /etc/ati - # Everything except for the authatieventsd.sh script. - doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default} - doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh - - # include. - insinto /usr - doins -r ${FOLDER_PREFIX}usr/include - insinto /usr/include/X11/extensions - - # Just the atigetsysteminfo.sh script. - into /usr - dosbin ${FOLDER_PREFIX}usr/sbin/* - - # data files for the control panel. - if use qt4 ; then - insinto /usr/share - doins -r ${FOLDER_PREFIX}usr/share/ati - insinto /usr/share/pixmaps - doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm - make_desktop_entry amdcccle 'AMD Catalyst Control Center' \ - ccc_large System - fi - - # doc. - dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx - - doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8 - - pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null - - exeinto /etc/acpi - doexe ati-powermode.sh - insinto /etc/acpi/events - doins events/* - - popd > /dev/null - - # Done with the "source" tree. Install tools we rebuilt: - dobin extra/fgl_glxgears/fgl_glxgears - newdoc extra/fgl_glxgears/README README.fgl_glxgears - - # Gentoo-specific stuff: - newinitd "${FILESDIR}"/atieventsd.init atieventsd - echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf - newconfd "${T}"/atieventsd.conf atieventsd - - # PowerXpress stuff - exeinto /usr/$(get_libdir)/fglrx - doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed" - cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx - doexe "${T}"/switchlibglx || die "doexe switchlibglx failed" -} - -src_install-libs() { - if [[ "${ABI}" == "amd64" ]]; then - local EX_BASE_DIR="${BASE_DIR}_64a" - local pkglibdir=lib64 - local MY_ARCH_DIR="${S}/arch/x86_64" - local oclsuffix=64 - else - local EX_BASE_DIR="${BASE_DIR}" - local pkglibdir=lib - local MY_ARCH_DIR="${S}/arch/x86" - local oclsuffix=32 - fi - einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system" - - local ATI_ROOT=/usr/$(get_libdir)/opengl/ati - # To make sure we do not miss a spot when these change. - local libmajor=1 libminor=2 - local libver=${libmajor}.${libminor} - - # The GLX libraries - # (yes, this really is "lib" even on amd64/multilib --marienz) - exeinto ${ATI_ROOT}/lib - newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \ - libGL.so.${libver} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so - - exeinto ${ATI_ROOT}/extensions - doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so - mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so - - # other libs - exeinto /usr/$(get_libdir) - # Everything except for the libGL.so installed some row above - doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \ - -maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*') - insinto /usr/$(get_libdir) - doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \ - -maxdepth 1 -type f -not -name '*.so*') - - # DRI modules, installed into the path used by recent versions of mesa. - exeinto /usr/$(get_libdir)/dri - doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so - - # AMD Cal and OpenCL libraries - exeinto /usr/$(get_libdir)/OpenCL/vendors/amd - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so* - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so* - dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so - exeinto /usr/$(get_libdir) - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* - - # OpenCL vendor files - insinto /etc/OpenCL/vendors/ - cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF - /usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so - EOF - doins "${T}"/amdocl${oclsuffix}.icd - - local envname="${T}"/04ati-dri-path - if [[ -n ${ABI} ]]; then - envname="${envname}-${ABI}" - fi - echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}" - doenvd "${envname}" - - # Silence the QA notice by creating missing soname symlinks - for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9]) - do - local soname=${so##*/} - local soname_one=${soname%.[0-9]} - local soname_zero=${soname_one%.[0-9]} - dosym ${soname} /usr/$(get_libdir)/${soname_one} - dosym ${soname_one} /usr/$(get_libdir)/${soname_zero} - done - - # See https://bugs.gentoo.org/show_bug.cgi?id=443466 - dodir /etc/revdep-rebuild/ - echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers" - - #remove static libs if not wanted - use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a - - #install xvba sdk headers - doheader xvba_sdk/include/amdxvba.h -} - -pkg_postinst() { - elog "To switch to AMD OpenGL, run \"eselect opengl set ati\"" - elog "To change your xorg.conf you can use the bundled \"aticonfig\"" - elog - elog "If you experience unexplained segmentation faults and kernel crashes" - elog "with this driver and multi-threaded applications such as wine," - elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2." - elog - elog "Fully rebooting the system after an ${PN} update is recommended" - elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg" - elog "might not work" - elog - elog "Some cards need acpid running to handle events" - elog "Please add it to boot runlevel with rc-update add acpid boot" - elog - - use modules && linux-mod_pkg_postinst - "${ROOT}"/usr/bin/eselect opengl set --use-old ati - "${ROOT}"/usr/bin/eselect opencl set --use-old amd - - if has_version "x11-drivers/xf86-video-intel[sna]"; then - ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server" - ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience" - ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or" - ewarn "try disabling sna for xf86-video-intel." - ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000" - fi -} - -pkg_preinst() { - use modules && linux-mod_pkg_preinst -} - -pkg_prerm() { - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} - -pkg_postrm() { - use modules && linux-mod_pkg_postrm - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} diff --git a/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild deleted file mode 100644 index 96bcbb0e0c5b..000000000000 --- a/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild +++ /dev/null @@ -1,621 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.4.ebuild,v 1.8 2015/03/31 18:10:48 ulm Exp $ - -EAPI=5 - -inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-utils - -DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets" -HOMEPAGE="http://www.amd.com" -MY_V=( $(get_version_components) ) -#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run" -SLOT="1" -if [[ "${MY_V[2]}" =~ beta.* ]]; then - BETADIR="beta/" -else - BETADIR="linux/" -fi -if [[ legacy != ${SLOT} ]]; then - DRIVERS_URI="http://www2.ati.com/drivers/${BETADIR}amd-catalyst-${PV/_beta/-beta}-linux-x86.x86_64.zip" -else - DRIVERS_URI="http://www2.ati.com/drivers/legacy/amd-driver-installer-catalyst-$(get_version_component_range 1-2)-$(get_version_component_range 3)-legacy-linux-x86.x86_64.zip" -fi -XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz" -SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}" -FOLDER_PREFIX="common/" -IUSE="debug +modules multilib qt4 static-libs disable-watermark pax_kernel" - -LICENSE="AMD GPL-2 QPL-1.0" -KEYWORDS="-* amd64 x86" - -RESTRICT="bindist test" - -RDEPEND=" - <=x11-base/xorg-server-1.13.49[-minimal] - >=app-eselect/eselect-opengl-1.0.7 - app-eselect/eselect-opencl - sys-power/acpid - x11-apps/xauth - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - virtual/glu - multilib? ( - app-emulation/emul-linux-x86-opengl - || ( - ( - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXrender-0.9.8[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) - ) - qt4? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXxf86vm - dev-qt/qtcore:4 - dev-qt/qtgui:4[accessibility] - ) -" -if [[ legacy != ${SLOT} ]]; then - RDEPEND="${RDEPEND} - !x11-drivers/ati-drivers:legacy" -else - RDEPEND="${RDEPEND} - !x11-drivers/ati-drivers:1" -fi - -DEPEND="${RDEPEND} - x11-proto/inputproto - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - x11-proto/xineramaproto - x11-libs/libXtst - sys-apps/findutils - app-misc/pax-utils - app-arch/unzip -" - -EMULTILIB_PKG="true" - -S="${WORKDIR}" - -# QA Silencing -QA_TEXTRELS=" - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/libatiadlxx.so - usr/lib*/xorg/modules/glesx.so - usr/lib*/libaticaldd.so - usr/lib*/dri/fglrx_dri.so -" - -QA_EXECSTACK=" - opt/bin/atiode - opt/bin/amdcccle - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/dri/fglrx_dri.so -" - -QA_WX_LOAD=" - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/dri/fglrx_dri.so -" - -QA_PRESTRIPPED=" - usr/lib\(32\|64\)\?/libXvBAW.so.1.0 - usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 - usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so - usr/lib\(32\|64\)\?/xorg/modules/glesx.so - usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/dri/fglrx_dri.so -" - -QA_SONAME=" - usr/lib\(32\|64\)\?/libatiadlxx.so - usr/lib\(32\|64\)\?/libaticalcl.so - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/libaticalrt.so - usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so -" - -QA_DT_HASH=" - opt/bin/amdcccle - opt/bin/aticonfig - opt/bin/atiodcli - opt/bin/atiode - opt/bin/clinfo - opt/bin/fglrxinfo - opt/sbin/atieventsd - opt/sbin/amdnotifyui - usr/lib\(32\|64\)\?/libaticalcl.so - usr/lib\(32\|64\)\?/libaticalrt.so - usr/lib\(32\|64\)\?/libatiuki.so.1.0 - usr/lib\(32\|64\)\?/libatiadlxx.so - usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0 - usr/lib\(32\|64\)\?/libXvBAW.so.1.0 - usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 - usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so - usr/lib\(32\|64\)\?/xorg/modules/glesx.so - usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so - usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/dri/fglrx_dri.so - usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so - usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so - usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2 - usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 - usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so - usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 -" - -CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" -ERROR_MTRR="CONFIG_MTRR required for direct rendering." -ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct - rendering to work." -ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire - as GPL-only. This prevents ${P} from compiling with an error like this: - FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'" -ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause - kernel to reject loading the fglrx module with - \"ERROR: could not insert 'fglrx': Exec format error.\" - You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead." - -_check_kernel_config() { - if ! linux_chkconfig_present AGP && \ - ! linux_chkconfig_present PCIEPORTBUS; then - ewarn "You don't have AGP and/or PCIe support enabled in the kernel" - ewarn "Direct rendering will not work." - fi - - kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then - die "CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38." - fi - - if use amd64 && ! linux_chkconfig_present COMPAT; then - die "CONFIG_COMPAT must be enabled for amd64 kernels." - fi -} - -pkg_pretend() { - if ! has XT ${PAX_MARKINGS} && use pax_kernel; then - ewarn "You have disabled xattr pax markings for portage." - ewarn "This will likely cause programs using ati-drivers provided" - ewarn "libraries to be killed kernel." - fi -} - -pkg_setup() { - if use modules; then - MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)" - BUILD_TARGETS="kmod_build" - linux-mod_pkg_setup - BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}" - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\"" - if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space" - else - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space" - fi - fi - # Define module dir. - MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod" - # get the xorg-server version and set BASE_DIR for that - BASE_DIR="${S}/xpic" - - # amd64/x86 - if use amd64 ; then - MY_BASE_DIR="${BASE_DIR}_64a" - PKG_LIBDIR=lib64 - ARCH_DIR="${S}/arch/x86_64" - else - MY_BASE_DIR="${BASE_DIR}" - PKG_LIBDIR=lib - ARCH_DIR="${S}/arch/x86" - fi - - elog - elog "Please note that this driver only supports graphic cards based on" - elog "Evergreen chipset and newer." - elog "This includes the AMD Radeon HD 5400+ series at this moment." - elog - elog "If your card is older then use ${CATEGORY}/xf86-video-ati" - elog "For migration informations please refer to:" - elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml" - einfo -} - -src_unpack() { - local DRIVERS_DISTFILE XVBA_SDK_DISTFILE - DRIVERS_DISTFILE=${DRIVERS_URI##*/} - XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/} - - if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then - unpack ${DRIVERS_DISTFILE} - else - #please note, RUN may be insanely assigned at top near SRC_URI - if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then - unpack ${DRIVERS_DISTFILE} - [[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}" - else - RUN="${DISTDIR}/${DRIVERS_DISTFILE}" - fi - sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die - fi - - mkdir xvba_sdk - cd xvba_sdk - unpack ${XVBA_SDK_DISTFILE} -} - -src_prepare() { - if use modules; then - if use debug; then - sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \ - "${MODULE_DIR}/firegl_public.c" \ - || die "Failed to enable debug output." - fi - fi - - # These are the userspace utilities that we also have source for. - # We rebuild these later. - rm \ - "${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \ - || die "bin rm failed" - - # in this version amdcccle isn't static, thus we depend on qt4 - use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle - - # ACPI fixups - sed -i \ - -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \ - -e "s:/var/lib/gdm/:/var/gdm/:" \ - "${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \ - || die "ACPI fixups failed." - - # Since "who" is in coreutils, we're using that one instead of "finger". - sed -i -e 's:finger:who:' \ - "${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \ - || die "Replacing 'finger' with 'who' failed." - # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and - # add function to detect default state. - epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch - - # see http://ati.cchtml.com/show_bug.cgi?id=495 - #epatch "${FILESDIR}"/ati-drivers-old_rsp.patch - # first hunk applied upstream second (x32 related) was not - epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch - - # compile fix for AGP-less kernel, bug #435322 - epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch - - # Compile fix for kernel typesafe uid types #469160 - epatch "${FILESDIR}/typesafe-kuid.diff" - - epatch "${FILESDIR}/linux-3.10-proc.diff" - - # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870 - use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch" - - cd "${MODULE_DIR}" - - # bugged fglrx build system, this file should be copied by hand - cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x - - convert_to_m 2.6.x/Makefile || die "convert_to_m failed" - - # When built with ati's make.sh it defines a bunch of macros if - # certain .config values are set, falling back to less reliable - # detection methods if linux/autoconf.h is not available. We - # simply use the linux/autoconf.h settings directly, bypassing the - # detection script. - sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed" - sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \ - || die "MODVERSIONS sed failed" - cd "${S}" - - mkdir extra || die "mkdir extra failed" - cd extra - unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz - - # Get rid of watermark. Oldest known reference: - # http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark - if use disable-watermark; then - ebegin "Disabling watermark" - driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so - for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do - sed -i "s/${x/x5b/\x5b}/\x90\x90\x90\x90\x90/g" ${driver} || break 1 - done - eend $? || die "Disabling watermark failed" - fi -} - -src_compile() { - use modules && linux-mod_src_compile - - ebegin "Building fgl_glxgears" - cd "${S}"/extra/fgl_glxgears - # These extra libs/utils either have an Imakefile that does not - # work very well without tweaking or a Makefile ignoring CFLAGS - # and the like. We bypass those. - # The -DUSE_GLU is needed to compile using nvidia headers - # according to a comment in ati-drivers-extra-8.33.6.ebuild. - "$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ - -I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \ - -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed" - eend $? -} - -src_install() { - use modules && linux-mod_src_install - - # We can do two things here, and neither of them is very nice. - - # For direct rendering libGL has to be able to load one or more - # dri modules (files ending in _dri.so, like fglrx_dri.so). - # Gentoo's mesa looks for these files in the location specified by - # LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded - # location /usr/$(get_libdir)/dri. Ati's libGL does the same - # thing, but the hardcoded location is /usr/X11R6/lib/modules/dri - # on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64 - # 64bit. So we can either put the .so files in that (unusual, - # compared to "normal" mesa libGL) location or set - # LIBGL_DRIVERS_PATH. We currently do the latter. See also bug - # 101539. - - # The problem with this approach is that LIBGL_DRIVERS_PATH - # *overrides* the default hardcoded location, it does not extend - # it. So if ati-drivers is merged but a non-ati libGL is selected - # and its hardcoded path does not match our LIBGL_DRIVERS_PATH - # (because it changed in a newer mesa or because it was compiled - # for a different set of multilib abis than we are) stuff breaks. - - # We create one file per ABI to work with "native" multilib, see - # below. - - echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep" - doenvd "${T}/03ati-colon-sep" || die - - # All libraries that we have a 32 bit and 64 bit version of on - # amd64 are installed in src_install-libs. Everything else - # (including libraries only available in native 64bit on amd64) - # goes in here. - - # There used to be some code here that tried to detect running - # under a "native multilib" portage ((precursor of) - # http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it - # should just work (only doing some duplicate work). --marienz - if has_multilib_profile; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - # This is sorted by the order the files occur in the source tree. - - # X modules. - exeinto /usr/$(get_libdir)/xorg/modules/drivers - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so - exeinto /usr/$(get_libdir)/xorg/modules/linux - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so - exeinto /usr/$(get_libdir)/xorg/modules - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so} - - # Arch-specific files. - # (s)bin. - into /opt - dosbin "${ARCH_DIR}"/usr/sbin/atieventsd - use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui - dobin "${ARCH_DIR}"/usr/bin/clinfo - # We cleaned out the compilable stuff in src_unpack - dobin "${ARCH_DIR}"/usr/X11R6/bin/* - - # Common files. - # etc. - insinto /etc/ati - exeinto /etc/ati - # Everything except for the authatieventsd.sh script. - doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default} - doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh - - # include. - insinto /usr - doins -r ${FOLDER_PREFIX}usr/include - insinto /usr/include/X11/extensions - - # Just the atigetsysteminfo.sh script. - into /usr - dosbin ${FOLDER_PREFIX}usr/sbin/* - - # data files for the control panel. - if use qt4 ; then - insinto /usr/share - doins -r ${FOLDER_PREFIX}usr/share/ati - insinto /usr/share/pixmaps - doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm - make_desktop_entry amdcccle 'AMD Catalyst Control Center' \ - ccc_large System - fi - - # doc. - dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx - - doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8 - - pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null - - exeinto /etc/acpi - doexe ati-powermode.sh - insinto /etc/acpi/events - doins events/* - - popd > /dev/null - - # Done with the "source" tree. Install tools we rebuilt: - dobin extra/fgl_glxgears/fgl_glxgears - newdoc extra/fgl_glxgears/README README.fgl_glxgears - - # Gentoo-specific stuff: - newinitd "${FILESDIR}"/atieventsd.init atieventsd - echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf - newconfd "${T}"/atieventsd.conf atieventsd - - # PowerXpress stuff - exeinto /usr/$(get_libdir)/fglrx - doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed" - cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx - doexe "${T}"/switchlibglx || die "doexe switchlibglx failed" -} - -src_install-libs() { - if [[ "${ABI}" == "amd64" ]]; then - local EX_BASE_DIR="${BASE_DIR}_64a" - local pkglibdir=lib64 - local MY_ARCH_DIR="${S}/arch/x86_64" - local oclsuffix=64 - else - local EX_BASE_DIR="${BASE_DIR}" - local pkglibdir=lib - local MY_ARCH_DIR="${S}/arch/x86" - local oclsuffix=32 - fi - einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system" - - local ATI_ROOT=/usr/$(get_libdir)/opengl/ati - # To make sure we do not miss a spot when these change. - local libmajor=1 libminor=2 - local libver=${libmajor}.${libminor} - - # The GLX libraries - # (yes, this really is "lib" even on amd64/multilib --marienz) - exeinto ${ATI_ROOT}/lib - newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \ - libGL.so.${libver} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so - - exeinto ${ATI_ROOT}/extensions - doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so - mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so - - # other libs - exeinto /usr/$(get_libdir) - # Everything except for the libGL.so installed some row above - doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \ - -maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*') - insinto /usr/$(get_libdir) - doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \ - -maxdepth 1 -type f -not -name '*.so*') - - # DRI modules, installed into the path used by recent versions of mesa. - exeinto /usr/$(get_libdir)/dri - doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so - - # AMD Cal and OpenCL libraries - exeinto /usr/$(get_libdir)/OpenCL/vendors/amd - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so* - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so* - dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so - exeinto /usr/$(get_libdir) - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* - - # OpenCL vendor files - insinto /etc/OpenCL/vendors/ - cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF - /usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so - EOF - doins "${T}"/amdocl${oclsuffix}.icd - - local envname="${T}"/04ati-dri-path - if [[ -n ${ABI} ]]; then - envname="${envname}-${ABI}" - fi - echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}" - doenvd "${envname}" - - # Silence the QA notice by creating missing soname symlinks - for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9]) - do - local soname=${so##*/} - local soname_one=${soname%.[0-9]} - local soname_zero=${soname_one%.[0-9]} - dosym ${soname} /usr/$(get_libdir)/${soname_one} - dosym ${soname_one} /usr/$(get_libdir)/${soname_zero} - done - - # See https://bugs.gentoo.org/show_bug.cgi?id=443466 - dodir /etc/revdep-rebuild/ - echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers" - - #remove static libs if not wanted - use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a - - #install xvba sdk headers - doheader xvba_sdk/include/amdxvba.h - - if use pax_kernel; then - pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed" - fi -} - -pkg_postinst() { - elog "To switch to AMD OpenGL, run \"eselect opengl set ati\"" - elog "To change your xorg.conf you can use the bundled \"aticonfig\"" - elog - elog "If you experience unexplained segmentation faults and kernel crashes" - elog "with this driver and multi-threaded applications such as wine," - elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2." - elog - elog "Fully rebooting the system after an ${PN} update is recommended" - elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg" - elog "might not work" - elog - elog "Some cards need acpid running to handle events" - elog "Please add it to boot runlevel with rc-update add acpid boot" - elog - - use modules && linux-mod_pkg_postinst - "${ROOT}"/usr/bin/eselect opengl set --use-old ati - "${ROOT}"/usr/bin/eselect opencl set --use-old amd - - if has_version "x11-drivers/xf86-video-intel[sna]"; then - ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server" - ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience" - ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or" - ewarn "try disabling sna for xf86-video-intel." - ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000" - fi - - if use pax_kernel; then - ewarn "Please run \"revdep-pax -s libGL.so.1 -me\" after installation and" - ewarn "after you have run \"eselect opengl set ati\". Executacle" - ewarn "revdep-pax is part of package sys-apps/elfix." - fi -} - -pkg_preinst() { - use modules && linux-mod_pkg_preinst -} - -pkg_prerm() { - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} - -pkg_postrm() { - use modules && linux-mod_pkg_postrm - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} diff --git a/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild deleted file mode 100644 index 610415f7beeb..000000000000 --- a/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild +++ /dev/null @@ -1,609 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.9.ebuild,v 1.5 2015/03/31 18:10:48 ulm Exp $ - -EAPI=5 - -inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-utils - -DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets" -HOMEPAGE="http://www.amd.com" -#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run" -SLOT="1" -DRIVERS_URI="https://www2.ati.com/drivers/linux/amd-catalyst-13.9-linux-x86.x86_64.zip" -XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz" -SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}" -FOLDER_PREFIX="common/" -IUSE="debug +modules multilib qt4 static-libs pax_kernel" - -LICENSE="AMD GPL-2 QPL-1.0" -KEYWORDS="-* amd64 x86" - -RESTRICT="bindist test" - -RDEPEND=" - <=x11-base/xorg-server-1.14.49[-minimal] - >=app-eselect/eselect-opengl-1.0.7 - app-eselect/eselect-opencl - sys-power/acpid - x11-apps/xauth - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - virtual/glu - multilib? ( - app-emulation/emul-linux-x86-opengl - || ( - ( - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXinerama-1.1.3[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXrender-0.9.8[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) - ) - qt4? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXxf86vm - dev-qt/qtcore:4 - dev-qt/qtgui:4[accessibility] - ) -" -if [[ legacy != ${SLOT} ]]; then - RDEPEND="${RDEPEND} - !x11-drivers/ati-drivers:legacy" -else - RDEPEND="${RDEPEND} - !x11-drivers/ati-drivers:1" -fi - -DEPEND="${RDEPEND} - x11-proto/inputproto - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto - x11-proto/xineramaproto - x11-libs/libXtst - sys-apps/findutils - app-misc/pax-utils - app-arch/unzip -" - -EMULTILIB_PKG="true" - -S="${WORKDIR}" - -# QA Silencing -QA_TEXTRELS=" - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/libatiadlxx.so - usr/lib*/xorg/modules/glesx.so - usr/lib*/libaticaldd.so - usr/lib*/dri/fglrx_dri.so -" - -QA_EXECSTACK=" - opt/bin/atiode - opt/bin/amdcccle - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/dri/fglrx_dri.so -" - -QA_WX_LOAD=" - usr/lib*/opengl/ati/lib/libGL.so.1.2 - usr/lib*/dri/fglrx_dri.so -" - -QA_PRESTRIPPED=" - usr/lib\(32\|64\)\?/libXvBAW.so.1.0 - usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 - usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so - usr/lib\(32\|64\)\?/xorg/modules/glesx.so - usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/dri/fglrx_dri.so -" - -QA_SONAME=" - usr/lib\(32\|64\)\?/libatiadlxx.so - usr/lib\(32\|64\)\?/libaticalcl.so - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/libaticalrt.so - usr/lib\(32\|64\)\?/libamdocl\(32\|64\)\?.so -" - -QA_DT_HASH=" - opt/bin/amdcccle - opt/bin/aticonfig - opt/bin/atiodcli - opt/bin/atiode - opt/bin/clinfo - opt/bin/fglrxinfo - opt/sbin/atieventsd - opt/sbin/amdnotifyui - usr/lib\(32\|64\)\?/libaticalcl.so - usr/lib\(32\|64\)\?/libaticalrt.so - usr/lib\(32\|64\)\?/libatiuki.so.1.0 - usr/lib\(32\|64\)\?/libatiadlxx.so - usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0 - usr/lib\(32\|64\)\?/libXvBAW.so.1.0 - usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 - usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so - usr/lib\(32\|64\)\?/xorg/modules/glesx.so - usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so - usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so - usr/lib\(32\|64\)\?/libaticaldd.so - usr/lib\(32\|64\)\?/dri/fglrx_dri.so - usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so - usr/lib\(32\|64\)\?/opengl/ati/extensions/fglrx-libglx.so - usr/lib\(32\|64\)\?/opengl/ati/lib/fglrx-libGL.so.1.2 - usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 - usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\)\?.so - usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 -" - -CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" -ERROR_MTRR="CONFIG_MTRR required for direct rendering." -ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct - rendering to work." -ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire - as GPL-only. This prevents ${P} from compiling with an error like this: - FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'" -ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause - kernel to reject loading the fglrx module with - \"ERROR: could not insert 'fglrx': Exec format error.\" - You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead." - -_check_kernel_config() { - if ! linux_chkconfig_present AGP && \ - ! linux_chkconfig_present PCIEPORTBUS; then - ewarn "You don't have AGP and/or PCIe support enabled in the kernel" - ewarn "Direct rendering will not work." - fi - - kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then - die "CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38." - fi - - if use amd64 && ! linux_chkconfig_present COMPAT; then - die "CONFIG_COMPAT must be enabled for amd64 kernels." - fi -} - -pkg_pretend() { - # workaround until bug 365543 is solved - if use modules; then - linux-info_pkg_setup - require_configured_kernel - _check_kernel_config - fi - - if ! has XT ${PAX_MARKINGS} && use pax_kernel; then - ewarn "You have disabled xattr pax markings for portage." - ewarn "This will likely cause programs using ati-drivers provided" - ewarn "libraries to be killed kernel." - fi -} - -pkg_setup() { - if use modules; then - MODULE_NAMES="fglrx(video:${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod/2.6.x)" - BUILD_TARGETS="kmod_build" - linux-mod_pkg_setup - BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}" - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\"" - if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space" - else - BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space" - fi - fi - # Define module dir. - MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod" - # get the xorg-server version and set BASE_DIR for that - BASE_DIR="${S}/xpic" - - # amd64/x86 - if use amd64 ; then - MY_BASE_DIR="${BASE_DIR}_64a" - PKG_LIBDIR=lib64 - ARCH_DIR="${S}/arch/x86_64" - else - MY_BASE_DIR="${BASE_DIR}" - PKG_LIBDIR=lib - ARCH_DIR="${S}/arch/x86" - fi - - elog - elog "Please note that this driver only supports graphic cards based on" - elog "Evergreen chipset and newer." - elog "This includes the AMD Radeon HD 5400+ series at this moment." - elog - elog "If your card is older then use ${CATEGORY}/xf86-video-ati" - elog "For migration informations please refer to:" - elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml" - einfo -} - -src_unpack() { - local DRIVERS_DISTFILE XVBA_SDK_DISTFILE - DRIVERS_DISTFILE=${DRIVERS_URI##*/} - XVBA_SDK_DISTFILE=${XVBA_SDK_URI##*/} - - if [[ ${DRIVERS_DISTFILE} =~ .*\.tar\.gz ]]; then - unpack ${DRIVERS_DISTFILE} - else - #please note, RUN may be insanely assigned at top near SRC_URI - if [[ ${DRIVERS_DISTFILE} =~ .*\.zip ]]; then - unpack ${DRIVERS_DISTFILE} - [[ -z "$RUN" ]] && RUN="${S}/${DRIVERS_DISTFILE/%.zip/.run}" - else - RUN="${DISTDIR}/${DRIVERS_DISTFILE}" - fi - sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die - fi - - mkdir xvba_sdk - cd xvba_sdk - unpack ${XVBA_SDK_DISTFILE} - - mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed" - cd "${WORKDIR}/extra" - tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz" -} - -src_prepare() { - if use modules; then - if use debug; then - sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \ - "${MODULE_DIR}/firegl_public.c" \ - || die "Failed to enable debug output." - fi - fi - - # These are the userspace utilities that we also have source for. - # We rebuild these later. - rm \ - "${ARCH_DIR}"/usr/X11R6/bin/fgl_glxgears \ - || die "bin rm failed" - - # in this version amdcccle isn't static, thus we depend on qt4 - use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle - - # ACPI fixups - sed -i \ - -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \ - -e "s:/var/lib/gdm/:/var/gdm/:" \ - "${S}/${FOLDER_PREFIX}etc/ati/authatieventsd.sh" \ - || die "ACPI fixups failed." - - # Since "who" is in coreutils, we're using that one instead of "finger". - sed -i -e 's:finger:who:' \ - "${S}/${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \ - || die "Replacing 'finger' with 'who' failed." - # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and - # add function to detect default state. - epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch - - # see http://ati.cchtml.com/show_bug.cgi?id=495 - #epatch "${FILESDIR}"/ati-drivers-old_rsp.patch - # first hunk applied upstream second (x32 related) was not - epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch - - # compile fix for AGP-less kernel, bug #435322 - epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch - - # Compile fix for kernel typesafe uid types #469160 - epatch "${FILESDIR}/typesafe-kuid.diff" - - epatch "${FILESDIR}/ati-drivers-13.6-linux-3.10-proc.diff" - - # Fix #483400 - epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch" - - # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870 - use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch" - - cd "${MODULE_DIR}" - - # bugged fglrx build system, this file should be copied by hand - cp ${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a 2.6.x - - convert_to_m 2.6.x/Makefile || die "convert_to_m failed" - - # When built with ati's make.sh it defines a bunch of macros if - # certain .config values are set, falling back to less reliable - # detection methods if linux/autoconf.h is not available. We - # simply use the linux/autoconf.h settings directly, bypassing the - # detection script. - sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed" - sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \ - || die "MODVERSIONS sed failed" -} - -src_compile() { - use modules && linux-mod_src_compile - - ebegin "Building fgl_glxgears" - cd "${S}"/extra/fgl_glxgears - # These extra libs/utils either have an Imakefile that does not - # work very well without tweaking or a Makefile ignoring CFLAGS - # and the like. We bypass those. - # The -DUSE_GLU is needed to compile using nvidia headers - # according to a comment in ati-drivers-extra-8.33.6.ebuild. - "$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ - -I"${S}"/${FOLDER_PREFIX}usr/include fgl_glxgears.c \ - -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed" - eend $? -} - -src_install() { - use modules && linux-mod_src_install - - # We can do two things here, and neither of them is very nice. - - # For direct rendering libGL has to be able to load one or more - # dri modules (files ending in _dri.so, like fglrx_dri.so). - # Gentoo's mesa looks for these files in the location specified by - # LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded - # location /usr/$(get_libdir)/dri. Ati's libGL does the same - # thing, but the hardcoded location is /usr/X11R6/lib/modules/dri - # on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64 - # 64bit. So we can either put the .so files in that (unusual, - # compared to "normal" mesa libGL) location or set - # LIBGL_DRIVERS_PATH. We currently do the latter. See also bug - # 101539. - - # The problem with this approach is that LIBGL_DRIVERS_PATH - # *overrides* the default hardcoded location, it does not extend - # it. So if ati-drivers is merged but a non-ati libGL is selected - # and its hardcoded path does not match our LIBGL_DRIVERS_PATH - # (because it changed in a newer mesa or because it was compiled - # for a different set of multilib abis than we are) stuff breaks. - - # We create one file per ABI to work with "native" multilib, see - # below. - - echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep" - doenvd "${T}/03ati-colon-sep" || die - - # All libraries that we have a 32 bit and 64 bit version of on - # amd64 are installed in src_install-libs. Everything else - # (including libraries only available in native 64bit on amd64) - # goes in here. - - # There used to be some code here that tried to detect running - # under a "native multilib" portage ((precursor of) - # http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it - # should just work (only doing some duplicate work). --marienz - if has_multilib_profile; then - local OABI=${ABI} - for ABI in $(get_install_abis); do - src_install-libs - done - ABI=${OABI} - unset OABI - else - src_install-libs - fi - - # This is sorted by the order the files occur in the source tree. - - # X modules. - exeinto /usr/$(get_libdir)/xorg/modules/drivers - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so - exeinto /usr/$(get_libdir)/xorg/modules/linux - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so - exeinto /usr/$(get_libdir)/xorg/modules - doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{glesx.so,amdxmm.so} - - # Arch-specific files. - # (s)bin. - into /opt - dosbin "${ARCH_DIR}"/usr/sbin/atieventsd - use qt4 && dosbin "${ARCH_DIR}"/usr/sbin/amdnotifyui - dobin "${ARCH_DIR}"/usr/bin/clinfo - # We cleaned out the compilable stuff in src_unpack - dobin "${ARCH_DIR}"/usr/X11R6/bin/* - - # Common files. - # etc. - insinto /etc/ati - exeinto /etc/ati - # Everything except for the authatieventsd.sh script. - doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default} - doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh - - # include. - insinto /usr - doins -r ${FOLDER_PREFIX}usr/include - insinto /usr/include/X11/extensions - - # Just the atigetsysteminfo.sh script. - into /usr - dosbin ${FOLDER_PREFIX}usr/sbin/* - - # data files for the control panel. - if use qt4 ; then - insinto /usr/share - doins -r ${FOLDER_PREFIX}usr/share/ati - insinto /usr/share/pixmaps - doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm - make_desktop_entry amdcccle 'AMD Catalyst Control Center' \ - ccc_large System - fi - - # doc. - dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx - - doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8 - - pushd ${FOLDER_PREFIX}usr/share/doc/fglrx/examples/etc/acpi > /dev/null - - exeinto /etc/acpi - doexe ati-powermode.sh - insinto /etc/acpi/events - doins events/* - - popd > /dev/null - - # Done with the "source" tree. Install tools we rebuilt: - dobin extra/fgl_glxgears/fgl_glxgears - newdoc extra/fgl_glxgears/README README.fgl_glxgears - - # Gentoo-specific stuff: - newinitd "${FILESDIR}"/atieventsd.init atieventsd - echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf - newconfd "${T}"/atieventsd.conf atieventsd - - # PowerXpress stuff - exeinto /usr/$(get_libdir)/fglrx - doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed" - cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx - doexe "${T}"/switchlibglx || die "doexe switchlibglx failed" -} - -src_install-libs() { - if [[ "${ABI}" == "amd64" ]]; then - local EX_BASE_DIR="${BASE_DIR}_64a" - local pkglibdir=lib64 - local MY_ARCH_DIR="${S}/arch/x86_64" - local oclsuffix=64 - else - local EX_BASE_DIR="${BASE_DIR}" - local pkglibdir=lib - local MY_ARCH_DIR="${S}/arch/x86" - local oclsuffix=32 - fi - einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system" - - local ATI_ROOT=/usr/$(get_libdir)/opengl/ati - # To make sure we do not miss a spot when these change. - local libmajor=1 libminor=2 - local libver=${libmajor}.${libminor} - - # The GLX libraries - # (yes, this really is "lib" even on amd64/multilib --marienz) - exeinto ${ATI_ROOT}/lib - newexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/fglrx/fglrx-libGL.so.${libver} \ - libGL.so.${libver} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so - - exeinto ${ATI_ROOT}/extensions - doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/fglrx/fglrx-libglx.so - mv "${D}"/${ATI_ROOT}/extensions/{fglrx-,}libglx.so - - # other libs - exeinto /usr/$(get_libdir) - # Everything except for the libGL.so installed some row above - doexe $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \ - -maxdepth 1 -type f -name '*.so*' -not -name '*libGL.so*') - insinto /usr/$(get_libdir) - doins $(find "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir} \ - -maxdepth 1 -type f -not -name '*.so*') - - # DRI modules, installed into the path used by recent versions of mesa. - exeinto /usr/$(get_libdir)/dri - doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so - - # AMD Cal and OpenCL libraries - exeinto /usr/$(get_libdir)/OpenCL/vendors/amd - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libamdocl*.so* - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libOpenCL*.so* - dosym libOpenCL.so.${libmajor} /usr/$(get_libdir)/OpenCL/vendors/amd/libOpenCL.so - exeinto /usr/$(get_libdir) - doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/libati*.so* - - # OpenCL vendor files - insinto /etc/OpenCL/vendors/ - cat > "${T}"/amdocl${oclsuffix}.icd <<-EOF - /usr/$(get_libdir)/OpenCL/vendors/amd/libamdocl${oclsuffix}.so - EOF - doins "${T}"/amdocl${oclsuffix}.icd - - local envname="${T}"/04ati-dri-path - if [[ -n ${ABI} ]]; then - envname="${envname}-${ABI}" - fi - echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}" - doenvd "${envname}" - - # Silence the QA notice by creating missing soname symlinks - for so in $(find "${D}"/usr/$(get_libdir) -maxdepth 1 -name *.so.[0-9].[0-9]) - do - local soname=${so##*/} - local soname_one=${soname%.[0-9]} - local soname_zero=${soname_one%.[0-9]} - dosym ${soname} /usr/$(get_libdir)/${soname_one} - dosym ${soname_one} /usr/$(get_libdir)/${soname_zero} - done - - # See https://bugs.gentoo.org/show_bug.cgi?id=443466 - dodir /etc/revdep-rebuild/ - echo "SEARCH_DIRS_MASK=\"/opt/bin/clinfo\"" > "${ED}/etc/revdep-rebuild/62-ati-drivers" - - #remove static libs if not wanted - use static-libs || rm -rf "${D}"/usr/$(get_libdir)/libfglrx_dm.a - - #install xvba sdk headers - doheader xvba_sdk/include/amdxvba.h - - if use pax_kernel; then - pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed" - fi -} - -pkg_postinst() { - elog "To switch to AMD OpenGL, run \"eselect opengl set ati\"" - elog "To change your xorg.conf you can use the bundled \"aticonfig\"" - elog - elog "If you experience unexplained segmentation faults and kernel crashes" - elog "with this driver and multi-threaded applications such as wine," - elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2." - elog - elog "Fully rebooting the system after an ${PN} update is recommended" - elog "Stopping Xorg, reloading fglrx kernel module and restart Xorg" - elog "might not work" - elog - elog "Some cards need acpid running to handle events" - elog "Please add it to boot runlevel with rc-update add acpid boot" - elog - - use modules && linux-mod_pkg_postinst - "${ROOT}"/usr/bin/eselect opengl set --use-old ati - "${ROOT}"/usr/bin/eselect opencl set --use-old amd - - if has_version "x11-drivers/xf86-video-intel[sna]"; then - ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server" - ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience" - ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or" - ewarn "try disabling sna for xf86-video-intel." - ewarn "For details, see https://bugs.gentoo.org/show_bug.cgi?id=430000" - fi - - if use pax_kernel; then - ewarn "Please run \"revdep-pax -s libGL.so.1 -me\" after installation and" - ewarn "after you have run \"eselect opengl set ati\". Executacle" - ewarn "revdep-pax is part of package sys-apps/elfix." - fi -} - -pkg_preinst() { - use modules && linux-mod_pkg_preinst -} - -pkg_prerm() { - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} - -pkg_postrm() { - use modules && linux-mod_pkg_postrm - "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11 -} diff --git a/x11-drivers/ati-drivers/files/ati-drivers-13.6-linux-3.10-proc.diff b/x11-drivers/ati-drivers/files/ati-drivers-13.6-linux-3.10-proc.diff deleted file mode 100644 index bdb22eae768a..000000000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-13.6-linux-3.10-proc.diff +++ /dev/null @@ -1,356 +0,0 @@ -diff --git a/common/lib/modules/fglrx/build_mod/drmP.h b/common/lib/modules/fglrx/build_mod/drmP.h -index 81546b2..4e74526 100755 ---- a/common/lib/modules/fglrx/build_mod/drmP.h -+++ b/common/lib/modules/fglrx/build_mod/drmP.h -@@ -901,10 +901,6 @@ int DRM(stub_register)(const char *name, - int DRM(stub_unregister)(int minor); - - /* Proc support (drm_proc.h) */ --extern struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev, -- int minor, -- struct proc_dir_entry *root, -- struct proc_dir_entry **dev_root); - extern int DRM(proc_cleanup)(int minor, - struct proc_dir_entry *root, - struct proc_dir_entry *dev_root); -diff --git a/common/lib/modules/fglrx/build_mod/drm_proc.h b/common/lib/modules/fglrx/build_mod/drm_proc.h -index 1e3ab4a..c52ad7e 100755 ---- a/common/lib/modules/fglrx/build_mod/drm_proc.h -+++ b/common/lib/modules/fglrx/build_mod/drm_proc.h -@@ -75,61 +75,6 @@ struct drm_proc_list { - #define DRM_PROC_ENTRIES (sizeof(DRM(proc_list))/sizeof(DRM(proc_list)[0])) - - /** -- * Initialize the DRI proc filesystem for a device. -- * -- * \param dev DRM device. -- * \param minor device minor number. -- * \param root DRI proc dir entry. -- * \param dev_root resulting DRI device proc dir entry. -- * \return root entry pointer on success, or NULL on failure. -- * -- * Create the DRI proc root entry "/proc/ati", the device proc root entry -- * "/proc/ati/%minor%/", and each entry in proc_list as -- * "/proc/ati/%minor%/%name%". -- */ --struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev, int minor, -- struct proc_dir_entry *root, -- struct proc_dir_entry **dev_root) --{ -- struct proc_dir_entry *ent; -- int i, j; -- char name[64]; -- -- if (!minor) root = create_proc_entry("dri", S_IFDIR, NULL); -- if (!root) { -- DRM_ERROR("Cannot create /proc/ati\n"); -- return NULL; -- } -- -- sprintf(name, "%d", minor); -- *dev_root = create_proc_entry(name, S_IFDIR, root); -- if (!*dev_root) { -- DRM_ERROR("Cannot create /proc/ati/%s\n", name); -- return NULL; -- } -- -- for (i = 0; i < DRM_PROC_ENTRIES; i++) { -- ent = create_proc_entry(DRM(proc_list)[i].name, -- S_IFREG|S_IRUGO, *dev_root); -- if (!ent) { -- DRM_ERROR("Cannot create /proc/ati/%s/%s\n", -- name, DRM(proc_list)[i].name); -- for (j = 0; j < i; j++) -- remove_proc_entry(DRM(proc_list)[i].name, -- *dev_root); -- remove_proc_entry(name, root); -- if (!minor) remove_proc_entry("dri", NULL); -- return NULL; -- } -- ent->read_proc = DRM(proc_list)[i].f; -- ent->data = dev; -- } -- -- return root; --} -- -- --/** - * Cleanup the proc filesystem resources. - * - * \param minor device minor number. -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index d3ad3ce..890a0aa 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -583,6 +583,202 @@ kcl_proc_list_t KCL_PROC_FileList[] = - { "NULL", NULL, NULL} // Terminate List!!! - }; - -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+typedef int (read_proc_t)(char *page, char **start, off_t off, int count, int *eof, void *data); -+typedef int (write_proc_t)(struct file *file, const char __user *buffer, unsigned long count, void *data); -+#else -+#define PDE_DATA(inode) (PDE((inode))->data) -+#endif -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+typedef struct { -+ read_proc_t *read_func; -+ write_proc_t *write_func; -+ void *data; -+} gentoo_proc_wrapper_t; -+ -+#define GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC 939750305 -+ -+static ssize_t gentoo_proc_wrapper_read (struct file *myfile, char __user *buffer, size_t count, loff_t *offset) { -+ int is_eof=0, retval; -+ char *start, *usebuffer=NULL; -+ gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data); -+ if (PAGE_SIZE<*offset) { -+ printk(KERN_ERR "Trying to read beyond 4k on proc\n"); -+ return -EIO; -+ } -+ //printk(KERN_NOTICE " call with: dev %p, func %p\n", wrapper_data->data, wrapper_data->read_func); -+ -+ usebuffer=kmalloc(2*PAGE_SIZE, GFP_KERNEL); -+ if (!usebuffer) -+ return -ENOMEM; -+ ((u32*)usebuffer)[1024]=GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC; -+ -+ retval=wrapper_data->read_func(usebuffer, &start, *offset, count, &is_eof, wrapper_data->data); -+ -+ BUG_ON(GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC != ((u32*)usebuffer)[1024]); -+ -+ if (0 > retval) -+ { -+ printk(KERN_ERR "Proc read failed with %d", retval); -+ goto out; -+ } -+ -+ if (copy_to_user(buffer, start, retval)) { -+ printk(KERN_NOTICE "copy to user failed in amd drivers proc code\n"); -+ retval=-EFAULT; -+ goto out; -+ } -+ *offset+=retval; -+ -+out: -+ if (usebuffer) -+ kfree(usebuffer); -+ return retval; -+} -+static ssize_t gentoo_proc_wrapper_write (struct file *myfile, const char __user *buffer, size_t count, loff_t *offset) { -+ gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data); -+ int retval=0; -+ void *usebuffer=NULL; -+ -+ BUG_ON(*offset); -+ if (!wrapper_data->write_func) -+ return -EPERM; -+ -+ usebuffer=kmalloc(count, GFP_KERNEL); -+ if (!usebuffer) -+ return -ENOMEM; -+ if (copy_from_user(usebuffer, buffer, count)) { -+ printk(KERN_NOTICE "copy from user failed in amd drivers proc code\n"); -+ retval=-EFAULT; -+ goto out; -+ } -+ -+ retval=wrapper_data->write_func(myfile, buffer, count, wrapper_data->data); -+ *offset+=retval; -+out: -+ if (usebuffer) -+ kfree(usebuffer); -+ return retval; -+} -+static int gentoo_proc_wrapper_open(struct inode *myinode, struct file *myfile) { -+ myfile->private_data=PDE_DATA(myinode); -+ return generic_file_open(myinode, myfile); -+} -+struct file_operations gentoo_proc_fops = { -+ .read=gentoo_proc_wrapper_read, -+ .write=gentoo_proc_wrapper_write, -+ .open=gentoo_proc_wrapper_open, -+}; -+ -+static void *gentoo_proc_wrapper_data(read_proc_t *reader, write_proc_t *writer, void *mydata) { -+ gentoo_proc_wrapper_t *retval=kmalloc(sizeof(gentoo_proc_wrapper_t), GFP_KERNEL); -+ if (!retval) -+ return retval; -+ retval->read_func=reader; -+ retval->write_func=writer; -+ retval->data=mydata; -+ return retval; -+} -+ -+static struct proc_dir_entry *firegl_proc_init( device_t *dev, -+ int minor, -+ struct proc_dir_entry *root, -+ struct proc_dir_entry **dev_root, -+ kcl_proc_list_t *proc_list ) // proc_list must be terminated! -+{ -+ struct proc_dir_entry *ent; -+ char name[64]; -+ kcl_proc_list_t *list = proc_list; -+ void *tempdata; -+ KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list); -+ if (!minor) -+ { -+ root = proc_mkdir("ati", NULL); -+ } -+ -+ if (!root) -+ { -+ KCL_DEBUG_ERROR("Cannot create /proc/ati\n"); -+ return NULL; -+ } -+ -+ if (minor == 0) -+ { -+ // Global major debice number entry -+ tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_major_proc_read, NULL, NULL); -+ if (!tempdata) -+ return NULL; -+ ent = proc_create_data("major", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata); -+ if (!ent) -+ { -+ remove_proc_entry("ati", NULL); -+ KCL_DEBUG_ERROR("Cannot create /proc/ati/major\n"); -+ return NULL; -+ } -+ } -+ -+ sprintf(name, "%d", minor); -+ *dev_root = proc_mkdir(name, root); -+ if (!*dev_root) { -+ remove_proc_entry("major", root); -+ remove_proc_entry("ati", NULL); -+ KCL_DEBUG_ERROR("Cannot create /proc/ati/%s\n", name); -+ return NULL; -+ } -+ -+ while (list->f || list->fops) -+ { -+ struct file_operations *my_fops = &gentoo_proc_fops; -+ if (list->fops) -+ { -+ my_fops = (struct file_operations*)list->fops; -+ tempdata=(dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev); -+ } -+ else { -+ BUG_ON(!list->f); -+ tempdata=gentoo_proc_wrapper_data((read_proc_t*)list->f, NULL, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev) ); -+ if (!tempdata) -+ return NULL; -+ } -+ //printk(KERN_NOTICE "name %s, dev %p, func %p, data %p\n", list->name, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev), list->f, tempdata); -+ ent = proc_create_data(list->name, S_IFREG|S_IRUGO, *dev_root, my_fops, tempdata); -+ -+ if (!ent) -+ { -+ KCL_DEBUG_ERROR("Cannot create /proc/ati/%s/%s\n", name, list->name); -+ while (proc_list != list) -+ { -+ remove_proc_entry(proc_list->name, *dev_root); -+ proc_list++; -+ } -+ remove_proc_entry(name, root); -+ if (!minor) -+ { -+ remove_proc_entry("major", root); -+ remove_proc_entry("ati", NULL); -+ } -+ return NULL; -+ } -+ -+ list++; -+ } -+ -+ if (minor == 0) -+ { -+ // Global debug entry, only create it once -+ tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_debug_proc_read_wrap, (write_proc_t*)firegl_debug_proc_write_wrap, dev); -+ if (!tempdata) -+ return NULL; -+ ent=proc_create_data("debug", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata); -+ if (!ent) -+ return NULL; -+ } -+ -+ return root; -+} -+#else - static struct proc_dir_entry *firegl_proc_init( device_t *dev, - int minor, - struct proc_dir_entry *root, -@@ -677,6 +873,7 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev, - - return root; - } -+#endif - - static int firegl_proc_cleanup( int minor, - struct proc_dir_entry *root, -@@ -6135,59 +6332,4 @@ void ATI_API_CALL KCL_fpu_end(void) - kernel_fpu_end(); - } - --/** Create new directory entry under "/proc/ati/...." -- * Where -- * root_dir - Root directory. If NULL then we should use "/proc/ati" root. -- * name - Pointer to the name of directory -- * access - Access attribute. We could use it to disable access to the directory for everybody accept owner. -- * By default owner is root. -- * Return NULL if failure. Pointer to proc_dir_entry otherwise -- */ --void * KCL_create_proc_dir(void *root_dir, const char *name, unsigned int access) --{ -- struct proc_dir_entry *dir = NULL; -- -- if (root_dir == NULL) -- dir = create_proc_entry(name, S_IFDIR | access, firegl_stub_root); -- else -- dir = create_proc_entry(name, S_IFDIR | access, (struct proc_dir_entry *)root_dir); -- -- return dir; --} -- --/* Remove proc directory entry -- * root - Pointer to directory proc entry or NULL if for "/proc/ati" -- * name - Name to delete -- */ --void KCL_remove_proc_dir_entry(void *root, const char *name) --{ -- if (root == NULL) -- remove_proc_entry(name, firegl_stub_root); -- else -- remove_proc_entry(name, (struct proc_dir_entry *)root); --} -- -- --/* Create proc_entry under "root_dir" -- * read_fn - Function which will be called on read request -- * write_fn - Function which will be called on write request -- * private_data - Pointer to private data which will be passed -- */ --void KCL_create_proc_entry(void *root_dir, const char *name, unsigned int access_mode, void *read_fn, void *write_fn, void *private_data) --{ -- struct proc_dir_entry *ent = NULL; -- -- if (root_dir == NULL || name == NULL) -- return; -- -- ent = create_proc_entry(name, access_mode, (struct proc_dir_entry *)root_dir); -- -- if (ent) -- { -- ent->read_proc = (read_proc_t *)read_fn; -- ent->write_proc = (write_proc_t *)write_fn; -- ent->data = private_data; -- } --} -- - #endif /* __KERNEL__ */ diff --git a/x11-drivers/ati-drivers/files/ati-drivers-do_mmap.patch b/x11-drivers/ati-drivers/files/ati-drivers-do_mmap.patch deleted file mode 100644 index 04248eb7bc5d..000000000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-do_mmap.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200 -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200 -@@ -2106,6 +2106,12 @@ - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) -+# define NO_DO_MMAP -+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f) -+# define do_munmap(a,b,c) vm_munmap(b, c) -+#endif -+ - unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval( - KCL_IO_FILE_Handle file, - unsigned long addr, -@@ -2117,10 +2123,13 @@ - - flags = MAP_SHARED; - prot = PROT_READ|PROT_WRITE; -- -+#ifdef NO_DO_MMAP -+ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff); -+#else - down_write(¤t->mm->mmap_sem); - vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff); - up_write(¤t->mm->mmap_sem); -+#endif - if (IS_ERR(vaddr)) - return 0; - else -@@ -2131,7 +2140,9 @@ - { - int retcode = 0; - -+#ifndef NO_DO_MMAP - down_write(¤t->mm->mmap_sem); -+#endif - #ifdef FGL_LINUX_RHEL_MUNMAP_API - retcode = do_munmap(current->mm, - addr, -@@ -2142,7 +2153,9 @@ - addr, - len); - #endif -+#ifndef NO_DO_MMAP - up_write(¤t->mm->mmap_sem); -+#endif - return retcode; - } - diff --git a/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch b/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch deleted file mode 100644 index 145abc757c7f..000000000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-kernel-3.8-acpihandle.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/kcl_acpi.c.ORIG 2014-01-21 10:38:08.951838343 +0100 -+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-01-21 10:42:25.728845582 +0100 -@@ -775,10 +775,10 @@ - unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo) - { - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) -- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19) -- pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle; -- #else -- pInfo->video_handle = pInfo->pcidev->dev.firmware_data; -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) -+ pInfo->video_handle = (acpi_handle)ACPI_HANDLE(&pInfo->pcidev->dev); -+ #else -+ pInfo->video_handle = DEVICE_ACPI_HANDLE(&pInfo->pcidev->dev); - #endif - if ( pInfo->video_handle && - (KCL_ACPI_videoDevice(pInfo->video_handle) != KCL_ACPI_OK) ) diff --git a/x11-drivers/ati-drivers/files/ati-drivers-linux-3.13-acpi-handle.patch b/x11-drivers/ati-drivers/files/ati-drivers-linux-3.13-acpi-handle.patch deleted file mode 100644 index 3ecc7c451447..000000000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-linux-3.13-acpi-handle.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 889165af52ba694f72d4d1e333a1f9ba14a82fde Mon Sep 17 00:00:00 2001 -From: Emil Karlson <jekarlson@gmail.com> -Date: Tue, 21 Jan 2014 23:25:26 +0200 -Subject: [PATCH] ati-drivers: linux-3.13 acpi handle - ---- - common/lib/modules/fglrx/build_mod/kcl_acpi.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/common/lib/modules/fglrx/build_mod/kcl_acpi.c b/common/lib/modules/fglrx/build_mod/kcl_acpi.c -index d875bf9..e063057 100755 ---- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c -+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c -@@ -792,7 +792,9 @@ static unsigned int KCL_ACPI_SearchHandles(KCL_ACPI_DevHandle handle, unsigned i - unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo) - { - #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) -- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) -+ pInfo->video_handle = (acpi_handle)ACPI_HANDLE(&pInfo->pcidev->dev); -+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0) - pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle; - #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19) - pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle; --- -1.8.3.2 - diff --git a/x11-drivers/ati-drivers/files/ati-drivers-vm-reserverd.patch b/x11-drivers/ati-drivers/files/ati-drivers-vm-reserverd.patch deleted file mode 100644 index 08045a65d9db..000000000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-vm-reserverd.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- common/lib/modules/fglrx/build_mod/firegl_public.c 2012-10-18 00:29:21.778369464 +0200 -+++ common/lib/modules/fglrx/build_mod/firegl_public.c.new 2012-10-18 00:30:39.647416026 +0200 -@@ -222,6 +222,10 @@ - #define preempt_enable() - #endif - -+#ifndef VM_RESERVED -+#define VM_RESERVED (VM_DONTEXPAND | VM_DONTDUMP) -+#endif -+ - // ============================================================ - /* globals */ diff --git a/x11-drivers/ati-drivers/files/check-for-iommu-only-if-iommu-is-supported.patch b/x11-drivers/ati-drivers/files/check-for-iommu-only-if-iommu-is-supported.patch deleted file mode 100644 index 7932487388f6..000000000000 --- a/x11-drivers/ati-drivers/files/check-for-iommu-only-if-iommu-is-supported.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1633d55aa0fb9c2ceb0ae1eab15bdec5066d35ae Mon Sep 17 00:00:00 2001 -From: Emil Karlson <jekarlson@gmail.com> -Date: Fri, 2 Aug 2013 01:18:41 +0300 -Subject: [PATCH 1/3] Check for iommu only, if iommu is supported. - ---- - common/lib/modules/fglrx/build_mod/kcl_iommu.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/common/lib/modules/fglrx/build_mod/kcl_iommu.c b/common/lib/modules/fglrx/build_mod/kcl_iommu.c -index c6602dd..803455c 100755 ---- a/common/lib/modules/fglrx/build_mod/kcl_iommu.c -+++ b/common/lib/modules/fglrx/build_mod/kcl_iommu.c -@@ -183,11 +183,13 @@ void ATI_API_CALL KCL_IOMMU_UnbindPasid( KCL_PCI_DevHandle pcidev,int pasid) - */ - int ATI_API_CALL KCL_IOMMU_CheckInfo( KCL_PCI_DevHandle pcidev) - { -+#if defined(CONFIG_INTEL_IOMMU) || defined(CONFIG_AMD_IOMMU) - struct pci_dev* pdev = (struct pci_dev*)pcidev; -- if ( pdev->dev.archdata.iommu ) -+ if ( pdev->dev.archdata.iommu ) - { - return 1; - } -+#endif - return 0; - } - --- -1.8.1.5 - diff --git a/x11-drivers/ati-drivers/files/linux-3.10-proc.diff b/x11-drivers/ati-drivers/files/linux-3.10-proc.diff deleted file mode 100644 index ce4871c0658b..000000000000 --- a/x11-drivers/ati-drivers/files/linux-3.10-proc.diff +++ /dev/null @@ -1,293 +0,0 @@ -diff -Nur common/lib/modules/fglrx/build_mod/drmP.h common-r1/lib/modules/fglrx/build_mod/drmP.h ---- common/lib/modules/fglrx/build_mod/drmP.h 2013-05-15 09:26:23.555752577 +0300 -+++ common-r1/lib/modules/fglrx/build_mod/drmP.h 2013-05-16 10:39:17.496212055 +0300 -@@ -901,10 +901,6 @@ - int DRM(stub_unregister)(int minor); - - /* Proc support (drm_proc.h) */ --extern struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev, -- int minor, -- struct proc_dir_entry *root, -- struct proc_dir_entry **dev_root); - extern int DRM(proc_cleanup)(int minor, - struct proc_dir_entry *root, - struct proc_dir_entry *dev_root); -diff -Nur common/lib/modules/fglrx/build_mod/drm_proc.h common-r1/lib/modules/fglrx/build_mod/drm_proc.h ---- common/lib/modules/fglrx/build_mod/drm_proc.h 2013-05-15 09:26:23.555752577 +0300 -+++ common-r1/lib/modules/fglrx/build_mod/drm_proc.h 2013-05-19 02:16:16.584406160 +0300 -@@ -75,61 +75,6 @@ - #define DRM_PROC_ENTRIES (sizeof(DRM(proc_list))/sizeof(DRM(proc_list)[0])) - - /** -- * Initialize the DRI proc filesystem for a device. -- * -- * \param dev DRM device. -- * \param minor device minor number. -- * \param root DRI proc dir entry. -- * \param dev_root resulting DRI device proc dir entry. -- * \return root entry pointer on success, or NULL on failure. -- * -- * Create the DRI proc root entry "/proc/ati", the device proc root entry -- * "/proc/ati/%minor%/", and each entry in proc_list as -- * "/proc/ati/%minor%/%name%". -- */ --struct proc_dir_entry *DRM(proc_init)(drm_device_t *dev, int minor, -- struct proc_dir_entry *root, -- struct proc_dir_entry **dev_root) --{ -- struct proc_dir_entry *ent; -- int i, j; -- char name[64]; -- -- if (!minor) root = create_proc_entry("dri", S_IFDIR, NULL); -- if (!root) { -- DRM_ERROR("Cannot create /proc/ati\n"); -- return NULL; -- } -- -- sprintf(name, "%d", minor); -- *dev_root = create_proc_entry(name, S_IFDIR, root); -- if (!*dev_root) { -- DRM_ERROR("Cannot create /proc/ati/%s\n", name); -- return NULL; -- } -- -- for (i = 0; i < DRM_PROC_ENTRIES; i++) { -- ent = create_proc_entry(DRM(proc_list)[i].name, -- S_IFREG|S_IRUGO, *dev_root); -- if (!ent) { -- DRM_ERROR("Cannot create /proc/ati/%s/%s\n", -- name, DRM(proc_list)[i].name); -- for (j = 0; j < i; j++) -- remove_proc_entry(DRM(proc_list)[i].name, -- *dev_root); -- remove_proc_entry(name, root); -- if (!minor) remove_proc_entry("dri", NULL); -- return NULL; -- } -- ent->read_proc = DRM(proc_list)[i].f; -- ent->data = dev; -- } -- -- return root; --} -- -- --/** - * Cleanup the proc filesystem resources. - * - * \param minor device minor number. -diff -Nur common/lib/modules/fglrx/build_mod/firegl_public.c common-r1/lib/modules/fglrx/build_mod/firegl_public.c ---- common/lib/modules/fglrx/build_mod/firegl_public.c 2013-05-15 09:26:23.545752925 +0300 -+++ common-r1/lib/modules/fglrx/build_mod/firegl_public.c 2013-05-19 03:07:10.236552522 +0300 -@@ -583,6 +583,202 @@ - { "NULL", NULL, NULL} // Terminate List!!! - }; - -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+typedef int (read_proc_t)(char *page, char **start, off_t off, int count, int *eof, void *data); -+typedef int (write_proc_t)(struct file *file, const char __user *buffer, unsigned long count, void *data); -+#else -+#define PDE_DATA(inode) (PDE((inode))->data) -+#endif -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -+typedef struct { -+ read_proc_t *read_func; -+ write_proc_t *write_func; -+ void *data; -+} gentoo_proc_wrapper_t; -+ -+#define GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC 939750305 -+ -+static ssize_t gentoo_proc_wrapper_read (struct file *myfile, char __user *buffer, size_t count, loff_t *offset) { -+ int is_eof=0, retval; -+ char *start, *usebuffer=NULL; -+ gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data); -+ if (PAGE_SIZE<*offset) { -+ printk(KERN_ERR "Trying to read beyond 4k on proc\n"); -+ return -EIO; -+ } -+ //printk(KERN_NOTICE " call with: dev %p, func %p\n", wrapper_data->data, wrapper_data->read_func); -+ -+ usebuffer=kmalloc(2*PAGE_SIZE, GFP_KERNEL); -+ if (!usebuffer) -+ return -ENOMEM; -+ ((u32*)usebuffer)[1024]=GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC; -+ -+ retval=wrapper_data->read_func(usebuffer, &start, *offset, count, &is_eof, wrapper_data->data); -+ -+ BUG_ON(GENTOO_PROC_WRAPPER_OVERFLOW_MAGIC != ((u32*)usebuffer)[1024]); -+ -+ if (0 > retval) -+ { -+ printk(KERN_ERR "Proc read failed with %d", retval); -+ goto out; -+ } -+ -+ if (copy_to_user(buffer, start, retval)) { -+ printk(KERN_NOTICE "copy to user failed in amd drivers proc code\n"); -+ retval=-EFAULT; -+ goto out; -+ } -+ *offset+=retval; -+ -+out: -+ if (usebuffer) -+ kfree(usebuffer); -+ return retval; -+} -+static ssize_t gentoo_proc_wrapper_write (struct file *myfile, const char __user *buffer, size_t count, loff_t *offset) { -+ gentoo_proc_wrapper_t* wrapper_data=(gentoo_proc_wrapper_t*)(myfile->private_data); -+ int retval=0; -+ void *usebuffer=NULL; -+ -+ BUG_ON(*offset); -+ if (!wrapper_data->write_func) -+ return -EPERM; -+ -+ usebuffer=kmalloc(count, GFP_KERNEL); -+ if (!usebuffer) -+ return -ENOMEM; -+ if (copy_from_user(usebuffer, buffer, count)) { -+ printk(KERN_NOTICE "copy from user failed in amd drivers proc code\n"); -+ retval=-EFAULT; -+ goto out; -+ } -+ -+ retval=wrapper_data->write_func(myfile, buffer, count, wrapper_data->data); -+ *offset+=retval; -+out: -+ if (usebuffer) -+ kfree(usebuffer); -+ return retval; -+} -+static int gentoo_proc_wrapper_open(struct inode *myinode, struct file *myfile) { -+ myfile->private_data=PDE_DATA(myinode); -+ return generic_file_open(myinode, myfile); -+} -+struct file_operations gentoo_proc_fops = { -+ .read=gentoo_proc_wrapper_read, -+ .write=gentoo_proc_wrapper_write, -+ .open=gentoo_proc_wrapper_open, -+}; -+ -+static void *gentoo_proc_wrapper_data(read_proc_t *reader, write_proc_t *writer, void *mydata) { -+ gentoo_proc_wrapper_t *retval=kmalloc(sizeof(gentoo_proc_wrapper_t), GFP_KERNEL); -+ if (!retval) -+ return retval; -+ retval->read_func=reader; -+ retval->write_func=writer; -+ retval->data=mydata; -+ return retval; -+} -+ -+static struct proc_dir_entry *firegl_proc_init( device_t *dev, -+ int minor, -+ struct proc_dir_entry *root, -+ struct proc_dir_entry **dev_root, -+ kcl_proc_list_t *proc_list ) // proc_list must be terminated! -+{ -+ struct proc_dir_entry *ent; -+ char name[64]; -+ kcl_proc_list_t *list = proc_list; -+ void *tempdata; -+ KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list); -+ if (!minor) -+ { -+ root = proc_mkdir("ati", NULL); -+ } -+ -+ if (!root) -+ { -+ KCL_DEBUG_ERROR("Cannot create /proc/ati\n"); -+ return NULL; -+ } -+ -+ if (minor == 0) -+ { -+ // Global major debice number entry -+ tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_major_proc_read, NULL, NULL); -+ if (!tempdata) -+ return NULL; -+ ent = proc_create_data("major", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata); -+ if (!ent) -+ { -+ remove_proc_entry("ati", NULL); -+ KCL_DEBUG_ERROR("Cannot create /proc/ati/major\n"); -+ return NULL; -+ } -+ } -+ -+ sprintf(name, "%d", minor); -+ *dev_root = proc_mkdir(name, root); -+ if (!*dev_root) { -+ remove_proc_entry("major", root); -+ remove_proc_entry("ati", NULL); -+ KCL_DEBUG_ERROR("Cannot create /proc/ati/%s\n", name); -+ return NULL; -+ } -+ -+ while (list->f || list->fops) -+ { -+ struct file_operations *my_fops = &gentoo_proc_fops; -+ if (list->fops) -+ { -+ my_fops = (struct file_operations*)list->fops; -+ tempdata=(dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev); -+ } -+ else { -+ BUG_ON(!list->f); -+ tempdata=gentoo_proc_wrapper_data((read_proc_t*)list->f, NULL, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev) ); -+ if (!tempdata) -+ return NULL; -+ } -+ //printk(KERN_NOTICE "name %s, dev %p, func %p, data %p\n", list->name, (dev->pubdev.signature == FGL_DEVICE_SIGNATURE)? firegl_find_device(minor) : (dev), list->f, tempdata); -+ ent = proc_create_data(list->name, S_IFREG|S_IRUGO, *dev_root, my_fops, tempdata); -+ -+ if (!ent) -+ { -+ KCL_DEBUG_ERROR("Cannot create /proc/ati/%s/%s\n", name, list->name); -+ while (proc_list != list) -+ { -+ remove_proc_entry(proc_list->name, *dev_root); -+ proc_list++; -+ } -+ remove_proc_entry(name, root); -+ if (!minor) -+ { -+ remove_proc_entry("major", root); -+ remove_proc_entry("ati", NULL); -+ } -+ return NULL; -+ } -+ -+ list++; -+ } -+ -+ if (minor == 0) -+ { -+ // Global debug entry, only create it once -+ tempdata=gentoo_proc_wrapper_data((read_proc_t*)firegl_debug_proc_read_wrap, (write_proc_t*)firegl_debug_proc_write_wrap, dev); -+ if (!tempdata) -+ return NULL; -+ ent=proc_create_data("debug", S_IFREG|S_IRUGO, root, &gentoo_proc_fops, tempdata); -+ if (!ent) -+ return NULL; -+ } -+ -+ return root; -+} -+#else - static struct proc_dir_entry *firegl_proc_init( device_t *dev, - int minor, - struct proc_dir_entry *root, -@@ -677,6 +873,7 @@ - - return root; - } -+#endif - - static int firegl_proc_cleanup( int minor, - struct proc_dir_entry *root, diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml index 9be3ac2fb435..5aa11eb6eeac 100644 --- a/x11-drivers/ati-drivers/metadata.xml +++ b/x11-drivers/ati-drivers/metadata.xml @@ -16,7 +16,6 @@ Install qt4 dependent optional tools (e.g Catalyst Control Panel) </flag> <flag name='modules'>Build the kernel modules</flag> - <flag name='disable-watermark'>Do a potentially dangerous binary search and replace to disable watermark</flag> <flag name='gdm-hack'>Do a potentially dangerous binary search and replace to fix gdm compatibility</flag> <flag name='pax_kernel'>Enable pax kernel specific patches</flag> </use> |