diff options
author | 2014-09-27 12:45:50 +0000 | |
---|---|---|
committer | 2014-09-27 12:45:50 +0000 | |
commit | ebab90dd7b703663903a54dd4a29efb4eb296100 (patch) | |
tree | 0ac80c24d0ecb92ab391ffe7c6f3f8cf668284c4 /media-gfx/blender | |
parent | add py3.3 support, correction and update to test phase, add commented text, m... (diff) | |
download | historical-ebab90dd7b703663903a54dd4a29efb4eb296100.tar.gz historical-ebab90dd7b703663903a54dd4a29efb4eb296100.tar.bz2 historical-ebab90dd7b703663903a54dd4a29efb4eb296100.zip |
rm old
Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020
Diffstat (limited to 'media-gfx/blender')
26 files changed, 34 insertions, 4017 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index 97e415bad832..9b01ecb52e63 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,24 @@ # ChangeLog for media-gfx/blender # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.271 2014/09/27 12:10:16 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.272 2014/09/27 12:45:45 hasufell Exp $ + + 27 Sep 2014; Julian Ospald <hasufell@gentoo.org> -blender-2.66-r1.ebuild, + -blender-2.67b-r1.ebuild, -blender-2.68.ebuild, -blender-2.68a.ebuild, + -blender-2.69.ebuild, -blender-2.70.ebuild, -blender-2.70-r1.ebuild, + -blender-2.70a-r3.ebuild, -blender-2.71.ebuild, -blender-2.71-r1.ebuild, + -files/blender-2.66-cmake.patch, -files/blender-2.66-doxyfile.patch, + -files/blender-2.66-sse2.patch, -files/blender-2.66-unbundle.patch, + -files/01-blender-2.67b-doxyfile.patch, + -files/06-blender-2.67b-fix-install-rules.patch, + -files/03-blender-2.67b-remove-binreloc.patch, + -files/07-blender-2.67b-sse2.patch, + -files/02-blender-2.67b-unbundle-colamd.patch, + -files/05-blender-2.67b-unbundle-eigen3.patch, + -files/04-blender-2.67b-unbundle-glog.patch, + -files/03-blender-2.68-remove-binreloc.patch, + -files/04-blender-2.70-unbundle-glog.patch, + -files/blender-2.70a-openmp.patch: + rm old *blender-2.72 (27 Sep 2014) diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 00caeeced9df..7ac89cee5246 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,70 +1,39 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX 01-blender-2.67b-doxyfile.patch 733 SHA256 54da3cad8c1ab1f436a74ea720a0bcd650885a4d504c769825fe0fb97bec75b3 SHA512 e361f0cb89639f31fad64fc8ebbafb313658c995d918ef0a15a7363e8483d0c62c57f51974001ef498ebbf1c3b6a42a0ce35c1df05d4ab5d010372e3d436f11e WHIRLPOOL 66f3c3cf385de8b9893a55638b0c7c538c047d1e64405c630ec75130e0c0a0507b82f311226da6fede1e3b40d67d9ba3b08a56a52e9a1427051394bade9386c3 AUX 01-blender-2.68-doxyfile.patch 732 SHA256 d485da5bdf1f123d945b8f945a84ead947ff123b4126a626bb394256ea07cbec SHA512 5191a25127e24d3ac7b18f6cd0b247e76a3fdeec46640f5d1ecba118fa35abbdaf19642c718e85149a304e9dc2093465b54b96e343f125163d091f045ab09db7 WHIRLPOOL 5cfdb697bf18aa50488495d017feda2e071332996a72e1a3c347291034c7230ad63c89e38670a86df633d3dc8359962e8888e4f0f1a2fa0b478acdb33a8f4d64 -AUX 02-blender-2.67b-unbundle-colamd.patch 1840 SHA256 8d5142ffdb433315b5c8107856c47f5848e58d8070d05e0a2a61531d54b9747a SHA512 d916efb1a94c9b6d443430bd793b8af3a024b11c8b8c0cfde3f6329994aa836831b5191af93c18ae21d5f80002a30d18e9c6577b982c60884b3b5ddfb93060d4 WHIRLPOOL 2f2c0fa0013a049816b5a0574ad29d4c45d467582d971fc99eabdcbebf11621fddff891c2466ec9dd4506c9b922326d967c3d534e83893419de169f0448ad760 AUX 02-blender-2.68-unbundle-colamd.patch 1863 SHA256 721620f8451f585a35725570cba5ed61106710f4dac9de6aaa81b3d5335db41f SHA512 3163b07fa184b0cff975e53adeb27f10fe01121fc55daf059d4967e5415ef590cfcab087bf862cdb8313319ea99d53252d04f72163cb092087b4e54bb778b623 WHIRLPOOL 450218063c8f999e7d16af9d01adf18847446bdf7a07166e4f8866413de6fd7c46dddcf0156c876bcd84c8775eaabfd0aaa6852f580d54bccf3c747f49afb7c4 AUX 02-blender-2.71-unbundle-colamd.patch 1592 SHA256 d86234ea75cec01786685e985a6f0f13b60f4fbd296e906d96a24beed9118598 SHA512 f3656380c588ebc54f327e1997e0b0f6fc9b2f3ac6fa2fcae6eb2c217503d5567fb88972d8eec4dd3a1f0dea0aee9171914d0436042d672c097e8777d31ff76b WHIRLPOOL bb8ece004007b4b25a7c772c0a2e8ccdb6ed21e5ab265446465feecd99c803434e0093e9e580893fdda34489cb4c404a56a46f09684a5f3854f23dd2f856eede -AUX 03-blender-2.67b-remove-binreloc.patch 918 SHA256 f654304421f63bb89862c1688aa288fae744519e03fa292dac191ea0a51c8b90 SHA512 7a53cdf6f31a0f33298adfc3113967547c75451552ce514749ed4926598f0fdffb4854c5443d140f76ec483be7342b4d18bdacfa460b3b3603072a7912429666 WHIRLPOOL ccfb950fe7dab6b7e1ca5e1a1a77327d7a32b8045518063b016dbb73b2595cc7b4281ead7d078089e3b9e7b17ab5566d641d73b3d8c5019b3ae0059220f6ea31 -AUX 03-blender-2.68-remove-binreloc.patch 918 SHA256 53c26a698bf5026593ba144133a4f8e89d6cd9433dbd6c2f2f6e5638d2d3e27c SHA512 71c973b208f3177b83ae23f224e66c8b8f8db50e8f822a7ff050fe77513ee68f834654b0099b4639fb718be9ac5ad4a1abae8397042818066cb477759a1887a3 WHIRLPOOL 9179ecac1ef919d75ed0ee9463b7df7861926eb3dd3c486de6798fe0aa6ca29dc1240bcf24efc035d91c442d87143576b4ea5957519f2793a2e82ea9c37391cd -AUX 04-blender-2.67b-unbundle-glog.patch 3278 SHA256 2eaf6be80747200763fb3a5956cd0883c178ce17995f1563c747347bad096a8a SHA512 e2189b0e0841e5239195501ad39e59e571ad609e8ae81b87669c9c28165d4b92c5bc55080067756ab7655339b8e276d2d90a762c3c8ab4653ced0f4cc5d9246f WHIRLPOOL 154b807351b27b74933683777aadb5b4ddd1208ab6aff5317e5ba2feb4e504469b0c82a76c293fb90247f7a41987b8c4842bd9b724bd165077117cf186ffd845 AUX 04-blender-2.68-unbundle-glog.patch 3352 SHA256 52e5d89d59e1610e84ab6e319e55c073f80b67bd94ed7bc2af1f57074a32405a SHA512 407d313cbc1bc21cab50e3344b4647a03c396ceeccca5e844c14b8c0110638bfe064a283ea886e81ee628278ce89f54aa6c8ce6d0b5b35cc987b42a311d806a1 WHIRLPOOL 28d3c152e6997d4f15f9bf94f1a3758f36928e44c10a8f7eb4fb2e524cf0af2dad9aae93eecc93d72f2c732e39e6f3b135071f391eeadfaa0fc121cd73ae30f9 -AUX 04-blender-2.70-unbundle-glog.patch 3328 SHA256 a3ea77f91417bcc685346c957fa5979f4c65f9e602e81295acd26f7bf4fb002d SHA512 2bd17df822e19c2ceefabbe4f9beedfc4ea2bd2bf1b37efbecaeebc1e3b4114e4e953f5aea46bfe1264fbd365b602963bd7fa115f7ec0e4d222b15ba87131cef WHIRLPOOL 4aa12f49a711ba18ee03dd96771b1fdb52984a29164db10ae81500fb5092c6bc810e5a78fbeee9c90e48a417c3f26517a34cae904a9dbecbea2c0b0081bded0e AUX 04-blender-2.71-unbundle-glog.patch 1650 SHA256 bec78cb9ec67f5a5fafdca06bf796c8e9a4f531fbf3ab78ebe124df317e9c8eb SHA512 92eaca756e5b0c6c1c958cb58a47b9aeb87dcd6494ec7a7fee83ec06887e3fa323886e44cfcc968e40f4cb99a352cdba56ea25c6c5a051b769101e0ae3eecdc1 WHIRLPOOL 54e65ec7e42d4e847caec17312b53e349fb40d2bac0a924ca7cedddaf8773acb30750a1f903b4c9c142c04d2ba76095a16ab50043ab1112b198bca5e048ef202 -AUX 05-blender-2.67b-unbundle-eigen3.patch 30917 SHA256 587dbe4c263e564edfde0611b2fdde3527442d9c72759912e3efa484bc1ff152 SHA512 1dc845eb8ea6a1f5dae43c88eba9130501b80fa6f9948d294beb236fd9d77f0d6dc8efedcd2827e50721b19b302f97912aacd9d2b0d5904ef08ca21970279194 WHIRLPOOL 4978a467dd548104ee05db32c9093bd59249d2ef6fef7baead3949d9f4b0d8224c1342ed707a17affca1c31e0bf078d7b0aa352b2093e738242e8e3b7cce5ba1 AUX 05-blender-2.68-unbundle-eigen3.patch 16058 SHA256 546bfc4ec8a4397a860ca15414698d90748f3b62fef106fab1bf842ab7515c52 SHA512 8b5d7a974c88611586fcc065b31a43756a23ca56aeb7204cae90d99657ff0f6505973c110def6fb80405db5607f2a6b5eef8eb26fb9065eef610437b5535282a WHIRLPOOL ad749aed40df519f8886a30bfbdf8cb243941d79da265226bc5f4e1c17b0cc180d3fcb1a41fc3ea982d31660b0a87fa0ab40c0e0a4defc996133eb90692b755e AUX 05-blender-2.72-unbundle-eigen3.patch 16059 SHA256 3117049d46c9422ccae069e050793fe9265cc120a1f319938bc73c704e0621e1 SHA512 549ab60c03252a789ac8fa1b01e53f3a633e081ecc647990ec360af5b8cb4875b4d107638f5b567631c6fa5e9d40c23116ea691bf9ce27565cf74db54f6214ae WHIRLPOOL b1fe13820dd573240443e2ab56ad7c93fd91b1e92ac975e1a7da406c25934de7f412587b939458f807a0aca3e26e4297c4c58ff22ee0dc35953925807f269fc4 -AUX 06-blender-2.67b-fix-install-rules.patch 740 SHA256 7b3b7a8b19c00b93ae2ebbc5f3cee294c20f8468b40fc5cd7fd686b81ba77adf SHA512 6ebd7ecb87a0137914145f38ded6bf4b7465391680329dc9a8a6fa00ae324cc81f49f485400c0edda6fe530b994231ae0eea6eb76cb8113b16f660d3da09f783 WHIRLPOOL 8ab814662605a492d0e7bbe0d899cfd35406ece17391a01951bb4d8ab285575126caf097772db174833c23ac5b3d4c67ed57ad54e9dcd2bc36e89fbeced23936 AUX 06-blender-2.68-fix-install-rules.patch 740 SHA256 93ae6cc8cfbb2ce856adf7a0dbf5966843630edaa4d7828de42d1bb5ba76058d SHA512 dd21cb3aa8bf965631132d39ad8a43c15d0c32faeaee00e8b8a970108fba0ab43b2402e3637dcd0b3430b7023ac9203b0395bbd2dc2dd9eb80d8c1d994d89e4f WHIRLPOOL 7c86d7637fdbf1d4c1f631b6a47c7e02399a00976189acaf9fc041765419cd2ffaaaab0d6fb05f4ba67024d14cfc778f3620f9d6cbf89e81b16a467e45beac75 -AUX 07-blender-2.67b-sse2.patch 1622 SHA256 9c8f6a35413b7d6fee235668c78d072850637978905b70b4596b9e0b38f39f6d SHA512 2cb77391c5fc66d0211020db3820e51fff63fba8dce4852f39e18701f42aef0a44b0546042f309350e66d05bcd8b2119123b76a8e9fc1f557d7e9f415a0528b0 WHIRLPOOL a81f7d76091fd36be71b9586a99014929fbedcd65b6e66e4418ad6d0f45d99e4d65f9c7880be129f349642258488ccee9b18bf7d8a1cc5379e14c863d3aee4e8 AUX 07-blender-2.68-sse2.patch 1622 SHA256 fb5aeba243e4da34a1d5ce3893f6db4b84ee90a1bedd6e89dbbfc8c4d7f47418 SHA512 06bc29c771e1d86813add2225523074b7d5ff622b0db4b2e2653917903abd2039b367d6c9e5a3a17021fc85a59585d518a2d05fb9872b7306589ddfbb9897780 WHIRLPOOL 5a0f0e652596687962720b1e6835fce1d0510c771efa7976deffeb3e35df3d5fbcf1400ad02ca4162cb4deccd46d101272e8514c0f6446f1f87afdf2a07eac24 AUX 07-blender-2.70-sse2.patch 1421 SHA256 b20d9aba206543e765e147e7740aff48ef968b90620d9d4b902cb6c23b9ba28f SHA512 9888110efaab16ec15438ad463c3ffa0bb4f64c23bb162254abe0ddb4acd42935a5fd1fdbf186b1cf1dad042044f8777b5f58c446423894788c655187bfe3cca WHIRLPOOL c3990dac70078a13ba005da5b649b9b72bdf04313551f2e41d639efc6a666006e1af54f11bb8c82608956df03547297303bf7a8a6e8cd03364d994910bde60c7 AUX 08-blender-2.71-gflags.patch 2223 SHA256 295c043088854b62da158ff6a445a8cdb0114a2298de32f4221cb483e9eb407a SHA512 efec5beed218ba0ab3c76ec65c47408631753567c31076cb8431923d5ff0df59c91ab1d2d42007944d307c6aba35746c2435eb9318b65fd69b4c2ed280570f87 WHIRLPOOL 4b5721af9fe9bebe4df1f324eb53f25459f454ce28f46b9af703c47660969b9a6dc1e73d544dbdad2738aad3a9ae53cf8d805bf20af8763f8a59b051302435c2 -AUX blender-2.66-cmake.patch 381 SHA256 284c09ec1f0a0fc52123c704c7b89fb8795d83c6c25c7decef44e298343591a5 SHA512 d91f92d7817d2a317ea2328afd120b47d20e475937b8ba478db27f1ebdf6a661b567b15d1e9a1f5e89be0a775181ee8cc0867b261988428e524ea5c82269d5f4 WHIRLPOOL 0b844e49f813044303d94d60fc11b6a3fe8afdbfcc76ce3bd89d16a373fe03c3e6c2629be3599eafed8c7265f4b692f3e8f9bede9ca82e0d57ee5d654463dd6d -AUX blender-2.66-doxyfile.patch 473 SHA256 4d6f50eb13f71b1ca083d8d8bfc3467660be586fe7d973acc9ce9b8b9d9b3337 SHA512 72e8ce59e485a2bbc4c09b367001fdef9d2a01c7b296bf001c1b708b4984625c40a8dd4ddee2b2ba962aa8f666cc8ed50229803d460ae79a807353080d16d520 WHIRLPOOL 45e0178cc55cd1f2e2e685173abb195367f3e61f07c55e007b44b7e3c14ef53ed0b098335044bca58e16787b738a65b23b223515296c6439e3bdfa9698a35dbf -AUX blender-2.66-sse2.patch 1255 SHA256 0b7d7374226daec957755364414b4327efdde0430324b011d3e7d1483845e375 SHA512 e658ed4f0d913c599235acfd871f7d1aceda20f17d01e3753683527bf8a659a882d0c83a05f437f55abc9e252099485a1632f2b5842ce57940f747701b709e86 WHIRLPOOL b6cafc4bbdb35f6aeef9229a18db618272ad4a6a40154d9f9e3bc5ab23b51bcf11b5612a4bc0672f1cacb0d37e3a035fad54b0930ef6725f44af3953ba61f97e -AUX blender-2.66-unbundle.patch 5475 SHA256 86025dc9d93fcd3acac8665cfc09d079bbf450ce12aac6844c7b37bc9dfeeb94 SHA512 86075ebcc388ded5407543e7a54303bb097bea124fd15ada7ae13a1b0949507b84e53133551d4d3aaeaab4d7e921d62857539b216af6bf7962beeca258e97d79 WHIRLPOOL 7b8489258e5d5108018f24927eec77d990af6c0bc565648d3f392251522249a7f54a5015d9880311a3169da495972dcfbfc88ee408c972ebbfd6b6b03ab73c85 -AUX blender-2.70a-openmp.patch 1188 SHA256 e82d464c9fc632894fd463bd9441587eb1c8bfc2c0f49005eaeb050c1e9f714a SHA512 bd62f4f4676c867bc4b63ace3b2184a8b82e88f642687be441f80ee669f803a7f1cd4a6c61bb1a3a5eaafb6afeadaeddac393994b858a7f4d6b3b725265a1dcd WHIRLPOOL fc4053d2ecc84da25676bc246c1b0af3ce26c23ca56b337236ac87f4dd27bbbb1a2317e984a80412d5b34802e07179e4c8ccd4566c59ad6086a46d09b4e2effb -DIST blender-2.66.tar.gz 36914318 SHA256 627a4bb12b6d971be76ae2ada080d5ed65904d7f83bcefe43a9a5a82cf433558 SHA512 f76499edc5f8179a42ec6d6334c6fa03f830570d054061ae40c2e8e1ec0a0090efcbb642f4f7f3b99d3941d4c4b791a0e357a275acf1b3ac251d58906f23b2b4 WHIRLPOOL cfc0e1cb441b41d4363dea28c0d2ac3879d49b417d43f5dce44c784cf78d924b3d640a698c8df3c842aa90a8f5c84faf80d4769f64505c151d0c965b4f28f48b -DIST blender-2.67b.tar.gz 41368150 SHA256 7d6701d92ee7e3923771de10f610a3f8cca8b6d14b488d3044f8329878187d67 SHA512 d9b24219770e51aac76a15cb6db486835d389e27a89d1ce890da0f0a30f3f76a070ddd9c21e739df93e7f4a670a6b3de993a6f56696983bf466be9c14e906525 WHIRLPOOL fee35d98766a8acf3bd2ca696ae1c9f0deb1422d45f3951c56bae6ea172fef1ecd21801e4696665e6a40384636aee59d5cb173ef31998aba985c41193f9d4949 -DIST blender-2.68.tar.gz 40073577 SHA256 3c102ebc42f989c8509c704c87dec465ba0ded81c9cfb15e44414ba2702ce21c SHA512 b7a8ce36714881d8dd809c3597695945cceddfc65ab2d20597a7d9c6327805d86edc4131cdc543d9267e120833781764a8a43a2dba06866fc4e62761f7c93ebf WHIRLPOOL d0bef7ad235d5738a243e7d48e6f451178fac9e400fc5d1dc82f1c400af737646a68d97087b8b56390a2488702d54cace7967abf49425e6c43fa7574ad4a72d5 -DIST blender-2.68a.tar.gz 40042207 SHA256 13ed290b0db381523dd26689d29fd00b08bae01a9123533d75f0243733dd7b3a SHA512 ce93779c5cbadf361f08ad0f9d5370d52878f94edc0b113d73711b842169d0e000e1500ece8e534439d94c5983e6ff3f15ca4ccd74db5f21447274c475090019 WHIRLPOOL 0d391db77b2ad3035f98f63ae4f299a14fd0d584c7ec0e35936b267c0ea300fe76ced0f79864a85bdd5c3f67a7299b8da2f03381513f4a6c550ef06355ea80da DIST blender-2.69.tar.gz 41274518 SHA256 c94a7f5dec0d42683b96b2591c240ebcc2743d10b84fc53ca13374b5e654ce09 SHA512 f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142 WHIRLPOOL 30b5e8dd4e2a8ed3a0e9484656d9ac5b6c420076438aa0cdabf3d5d6b5d608bb90d5253c365b712899a9b7ea8965b815059e3e8c5a712c07c399f7848c14e8cb -DIST blender-2.70.tar.gz 55298021 SHA256 2695c3cab21721d1108c90e6e9cb4b279817f551904d5276793fb3adaef3e348 SHA512 5c5d3aa418b88eb55d25a28967edc9ff51b4f9337e15d662db8f4e23eea0772f31a256a7effdd1ffecf0636a300b821a7c53dd1c8b46311b572b412b758224af WHIRLPOOL 9174b325f0d027a56342699cde14fb3ef0883c3089573c9560af1d5adaa9e0815f1e449fd22da4fdc36efa5526094ed37b028e447fc987fba88f08944d75ceb5 -DIST blender-2.70a.tar.gz 55875629 SHA256 eb2d82e4bace4028e05eef2ac9799104231eafd91f1500b91c32471bac8cf3e5 SHA512 777938abf30a336bab83a7418461d8d435cc3dc1421aeddc36657d5b8bae1742a38ee468020cee04f4089b646bff1c3715ad9ceb987d649eb3d015047f1869d7 WHIRLPOOL b7a3bf59a078e425e09b32289372ddf23ac6172f64e07bc45b875857b733e4414021cb99cf65596bdf271ce501a7ba946c8e4c0434947af6b0f552364ec5a040 -DIST blender-2.71.tar.gz 57120144 SHA256 7daa7f8ce1df495ad20843aa86bc5268179085ec2963655c358b65a2b365ffa2 SHA512 59092cc0e49030ffc0094fac96272d618428d8964337002a331bf52438c7dd7d24d7bc7930a5b6b5073389144e789a971402bae2eda827ec79ee193b03bd5697 WHIRLPOOL b57a909be3c671f1b4ce21ef8026d3e07451257606dc4f80100393e38bb2de675ed5adc0984bfb4977fb4f5a3b11504c9d2559cc3ff08b773f7912311ebe2bee DIST blender-2.72.tar.gz 57506461 SHA256 17a90210180d6ffa189b3a0546a6b0103aeae3df49ecb5356cc05b5bb455d8b9 SHA512 94f9ad214ccf53e7bea8de327aec745b6c6d77dbb44d3c3ed9703543eb136152bfc54d17f60ce376dc1212f2f7045b07b6d976ccb5ddb9c3f84d684eaa7cb8a0 WHIRLPOOL 8f39c1d78c017968067a2648ef4be6decc914d92fd87f5ee131a4a1a37503e3ed920fa2e73e3d03daeb61ef006cb91b8b99b4e591d29af37af25b3cb70afa21c -EBUILD blender-2.66-r1.ebuild 7134 SHA256 606b40465cf7a924fbe05e3876de1a53c8e29a90463d0c0f1ef1a1e9932df0f2 SHA512 a8a024cb67f42aaef19a99c5aae9249e24ac574087aa521ddc268c2d484d7c0a49093610e2f1a71b47897a4d35460db00051483141719bfc3f3dcabea828de8d WHIRLPOOL bc6ce0a78191ace1ab98b38f530585246dc4956e2af23b734e2fac2656bd28b59ddae0c0a83d76bb6ffab15730cd853038f4dd91bb2d90f999b4c3696289c78f -EBUILD blender-2.67b-r1.ebuild 7422 SHA256 3f1a8d5e1e8d852a31d6bfbcc7aae23f233f52e05aa0ad8e685474bf50ddc13a SHA512 4e68e61a16d0af7267d93b222ea2979b83879b9250ebc252d6e67d7aab48bd37c28b594ded0c76241f41d99b4686da3850b584725e890afb73b47f156deab442 WHIRLPOOL 21bf889f442bed7626b335c7332a49889d244f8089a657d8beda8862644753987900e070294cb4b328c5a5a278d802266d6cf1314fec2a146b650db4c79a8c8e -EBUILD blender-2.68.ebuild 7484 SHA256 8386818a2c0d01128a3ce7ed5716a76ccd4ce382adc3c38b7c9cee0e286ffbe4 SHA512 9b240f87fa0ac8baf5194374726338f59902ae8323ce9758a35111e7dd39a5e4741810f96771d633e5da3f3b51e0329fa4c521528eaedd6c6b1088d08fb9aff5 WHIRLPOOL deac1ada6f70823626a8f3532dac73d32272f067c884bdf62e78c524a40afbbb4581b8eb69c8042171741aa0d42fa4d751af7c8086bf82e975b8c0105f49021e -EBUILD blender-2.68a.ebuild 7527 SHA256 5b72c3c81d99ac4dc751cd3527a723d7f8a57bdc44c073d0b0459f15f9b69349 SHA512 cd09cacf3be6709495ae53bbf456eb84cd559c3d2041055916a4f77cd3789a670ae7aa34b454cd32151ab800a624ab13c2f616e4545b221caf9f3c697fb7d82b WHIRLPOOL 02afa154f8feeba0c9c6faea9569b41d4df6d2fbcebc9e0257b7db10e30866cb1a8cbd33a8db33b01ad84e801954201a379544c680de8cad9cadb1e9868bc232 EBUILD blender-2.69-r1.ebuild 7376 SHA256 c6eacb81387cd56abf9dd4357338fb592e8b6778bdd114a7b789755f0bc7eaa9 SHA512 729cbcb4963c960315e64b28cc1d011867d6e9792bb423c4fad20330abbabb718792470a2e3235757a05c641d32b6f9f3736ce9535b5db71f54798adb9e2d6a6 WHIRLPOOL a4b5a9540d0f7f72bbc8e8102c80cd6577eba522d933ed3997ee607226eeed8477503e6376811433705395ddeecbd5132c828ee3960f106f85c47967696db809 -EBUILD blender-2.69.ebuild 7573 SHA256 ad03858313b71ddcaa1eb595d120f2aa41808a67323488074e41820203922138 SHA512 0cc72ce3ddece237574928d3baf22342f9694f8d6df7daa126d709ddc560d22846d0dd1de3d1f85297313e8cec210d9dba177da85a15af88f961d074725fe5d9 WHIRLPOOL cf0647b7acd97740129e74924a7ad579ced670a2549b9f705f2a79fa28c1878cc9d7c8b8411e0de359bdd3ba9d6d4570426d9786be96b720d09b8f9856531593 -EBUILD blender-2.70-r1.ebuild 7570 SHA256 ba50201a638acb6dac73c67e6ed525728929fca1acacfeaa030c7fa8564d5b4b SHA512 119a877bfb6427c695c7d16bc2bcc91448d5e0b13c701fcf46ba62d8f2dfd3206641385e321f540e47ca1638f30d57ecd7c9724500e34b4baf0a520a0e1d9a8d WHIRLPOOL f2c5363905da28ec853ecb7673c176f69a0d82fdcb70e86daaaa783d184f912e40899474b965367ed2abfc9e62a3f28f4f512c6b1dac17c1bb1f40e9a6dce9c7 -EBUILD blender-2.70.ebuild 7767 SHA256 1b77f8daa513629173e70fc766864fe42cd1cc6d664c1214329645623ab54ac9 SHA512 8be39580f04eaa5e2d83d853b93463c6d6f56d4b14088bc65d7670978df71d61aea703f984417cafa260cdda8764fc4510d75ca0ce7fc904cb156c248c6a11de WHIRLPOOL 005bcb8c5534570b7abfeb4bc941ffbf8057eccaf85d4006425f4db033c7b487886ba753203e0e6c694b13aa801306b6d26970bc7c77ab83f2e6ee3a6c06e6bd -EBUILD blender-2.70a-r3.ebuild 7663 SHA256 a16efb84ee8f89d4248b01fc940cc24c56163ea02311fae9a2943ff0aba3f4bd SHA512 2972f4d9051d22fa7275313b682047c80e8fae697ab3beea08c12e58cc9e8cae0149ac3ec5090d7582bab9a2a1675a4c438ce8718ecc24b4587581525e0879ce WHIRLPOOL f8fe963fcaf7e543e599b2b694c98ce4eeebab37ed6f6d11973f9e106e16e3a347a0831d45f7ddceaf612b46e2c4ad874eb2c788c3dd0986ce3c9be5d9abe81b -EBUILD blender-2.71-r1.ebuild 7676 SHA256 0a6088249797e7b1e05b135319f73516e80e44b7ed4466bbdcd28f5c8fb53a03 SHA512 fbfeb877dd1eb4d983664e304c772877621c01a2232535710e75039f31aa207b1e9f436635596ab33f9e9dba38bff0baa10faea61b4b0f86c76159ebf2543aad WHIRLPOOL 505c292c467d109d33a632aad73343a08be07250daefc16a3307407c32d4f7b5e484c23f4d24efbc190d44a23e986677a67e68bf62d85067d0b44f18e2f0b811 -EBUILD blender-2.71.ebuild 7584 SHA256 ba1e19cee68ef2e1238aafb4d884e8fc0e344ed6fa0d37b703a3c9d60e32ac1e SHA512 0d64b54f0ad5958a60d9469c453c9de32479ff25288768b109bc71afb7212121c766131654ed7e3dac3524d7e5dcdfcf2131d022627766f87ed701af16215422 WHIRLPOOL d5bde04a0afdfc8bd2822dd04e470a195e6644317cb77784863d6c443bb9ff9e39de317a5473f1aaa6f2b379c56762b0da3f09e38ed9cfbe19716e7fee8ab932 EBUILD blender-2.72.ebuild 7673 SHA256 fa153e27698a0a7e8e36aed8f7c1fdcdeac6d00f65d72c9997129ee26b36c86c SHA512 108e1c275f3a42007ab6b91e5773590acf61703f622ebbf62d9ec31312cab4dc7e526edade7378dcac3624b2eab852b4c0dcf221c8081e89b6c90bbaf7d83155 WHIRLPOOL deef57c51751dd8f532e35438f0f191f4537900fc08811416d0d37056e8b84140d94e499a3387d7a45cb29de9be31aef893bcd2bc81a2615ac4c8ae5476222bd -MISC ChangeLog 47856 SHA256 9ac31722f15206409e58dcef458124d969d86f952ed4ddfb8ffe5469d77eb861 SHA512 f98a30ebce2b5e1bdab95b899c344a54c52443dd99a850d5fa85204b62483e2c225de5cec7e423ca42a9bd93854f825a0b3450bc0e6611a728160cb135ded9d7 WHIRLPOOL a00b42ad9e1178c90592ab36a20061c9b4a484774beabdfde86eab270433428c7095eeab1b2288f939a61ae174c0c4084d4edf56b44962e0eb649bbb16123435 +MISC ChangeLog 48758 SHA256 d63325b9eb6dfbf024322032fa8f85bf4212a31579eac3f8e3eee5c7b915853c SHA512 1578522cf7404925d7015098ba8a5e6fadd734801be743d1101bda96d3fe4752a7e718702586a373b229a6d8b66741238d8c216805e7efb91f7ad9f8bedf3eb0 WHIRLPOOL cefc189d6b2595ecfde7b19436f8961109e261a5da3ef5c88f418030732c2c13bf7dd08f59efc66a70d79b56ea096121e4dba289d693e2a77c39d8665a84dd44 MISC metadata.xml 1943 SHA256 442b4b8f917e536321467f5b4408d6530fc8030db5d3efa532a007aaa81defb0 SHA512 8a18cfb1afc6e465c3e10698470794971c2b967f914332421817bbe1c6dc92372d61139803d3b5b7bdd5fd6a80c53b0eb2d0554ae8b41e5d5e4b75de30969a0c WHIRLPOOL 9ab06cf2763dbedc21723e36e9afa72710d8299f602c63152345ea3c67ea3398d8e7ac0c6b4b1c37a2767cb6598b5a76d793ab300483a052c00e6789f08f648c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUJqkrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJUJrF9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy -MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAggv4QALrFmyTK8gQcceNhnkge1G95 -5mWk8VtDfpKAULr2iBGuY/2viN0C5JBnI7TZOvA03PKg/f2eKiTvZ/Hws0TS3tmO -L2we2aWFRmgaFqNKztFjpLIiJhS53nqBli+14UO1rZfUcxIIP/QHoDmU6ZJQjtLk -PJzeZmieh1PE+9smw+amqUj82PZGHQLJCTaBuXjFqO4x2+ZVe78COTjO14/x5x9a -27Tsvhn82JYhFM/BJCFC8e7sUNA6iQQn2IsfIhEqqNLlF+cmXHHH2zjRuNDJCklE -iCSjtziPDO3ELDmzIf15BaaN/1LPBT19z+OuyzZi4lVtaUc3xKL2aCM+kRw3uAbQ -xE5mpaYZaxod3KvukEhN4vG8x5QYZxSkNryoCxeijh4/ixUJMmMNECh5DwM6HUbF -qe2ikBNkIcUSSnKIrc1bFkIBMRrpyAQOC2BQkoagVSXHbz3AwsEYLWx8a95qYJEb -HKFu0URG8ut25E1yvgH89mw31FFcKvjcBD6k//wycWHZ7E7Q408HxXlr/u62X39v -YPHDC2Acc1CporpxGPWAHa5Z5nqf5g80K0sutVG8ms1C9m1glaaJG3LbDtddZLMm -KdI8CVGBIyL3xev7JwkP8Rc8UFX0b6RpYIbbNfDAMmwEONS6ANuY3UR1Kr/dDfLp -zDVmCPhsqEkiRpnItJCt -=X5JR +MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg5t4P/Rjh5KpwJXQgw8n/d5Vb+ZpN +z57son/TnKe5+WpTDzgD6Q2Xbbq7fGtDcvWnk1I4cIseFvs97cz+Xt0ktT0vpZ6c +h1iK5zeYLEniqd57rs4f+49z+U/0VkFzmbeGe0t84QmgRw7iTw6Sbp5vQCHFOHJb +xmQHq8mWom0IsI9u+JIZ425g5S6nFyLO757CQc4nuchsiJ687O1IswqWPW1xqiUr +QfXXIFybeqtnIW56/Oggc2soNH1oi2yGBXjj3eHFCXoEP+HwMzzrot7FvQy+MPsT +Jmt5xMjvl/0sn/5shmxclKSr5ntCnDTB8aGbYHMaGkbW0fxf1o0LkNxRyTLUqn1a +eGTDbpK2GYgpt1BE6BlplwiwmT+Mez47kKKTmjCSo88aKOPpgFRdFqlfoHkJ/usU +fTFqpBf8G6GfgyP7R0+mfc285QsCdB89GxZmF6ERvmduVB4M/yetXrZVt0YcmxS2 +T7Wp5zGMlkr7JyfycusV5U2ob3HqmySr8uyyqdf45cnw47vLtpLvW+KYWEytmn0D +v374uo0ZAadX49Izph0vTk70vyqwHnJWiROUDU7UmD1KtV7L3whMQKPNdMoro7Cy +d/68rvgIPUidGV2Yg/N/4e/8UGDF08U7TOPChjYhISgS2kF3+5HMZ86uiQ2zUGPC +5JokZrdUGpZ4mJuY7ydi +=DG2y -----END PGP SIGNATURE----- diff --git a/media-gfx/blender/blender-2.66-r1.ebuild b/media-gfx/blender/blender-2.66-r1.ebuild deleted file mode 100644 index 1105eff25d49..000000000000 --- a/media-gfx/blender/blender-2.66-r1.ebuild +++ /dev/null @@ -1,258 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.66-r1.ebuild,v 1.2 2014/05/15 17:08:04 ulm Exp $ - -# TODO: -# bundled-deps: eigen:3 is too old -# bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_3 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gflags - dev-cpp/glog[gflags] - dev-python/numpy[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( media-libs/opencolorio ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k?] - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.66-{unbundle,cmake,doxyfile,sse2}.patch - - # remove some bundled deps - rm -r \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/binreloc \ - extern/libmv/third_party/{ldl,glog,gflags} \ - || die - - # turn off binreloc (not cached) - sed -i \ - -e 's#set(WITH_BINRELOC ON)#set(WITH_BINRELOC OFF)#' \ - CMakeLists.txt || die - - # we don't want static glew, but it's scattered across - # thousand files - sed -i \ - -e '/add_definitions(-DGLEW_STATIC)/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - for i in "${S}"/release/datafiles/locale/* ; do - mylang=${i##*/} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripting." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/blender-2.67b-r1.ebuild b/media-gfx/blender/blender-2.67b-r1.ebuild deleted file mode 100644 index 3634b76e2fba..000000000000 --- a/media-gfx/blender/blender-2.67b-r1.ebuild +++ /dev/null @@ -1,266 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.67b-r1.ebuild,v 1.3 2014/05/15 17:08:04 ulm Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_3 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gflags - dev-cpp/glog[gflags] - dev-python/numpy[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( media-libs/opencolorio ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k?] - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${P}-doxyfile.patch \ - "${FILESDIR}"/02-${P}-unbundle-colamd.patch \ - "${FILESDIR}"/03-${P}-remove-binreloc.patch \ - "${FILESDIR}"/04-${P}-unbundle-glog.patch \ - "${FILESDIR}"/05-${P}-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${P}-fix-install-rules.patch \ - "${FILESDIR}"/07-${P}-sse2.patch - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/binreloc \ - extern/libmv/third_party/{ldl,glog,gflags} \ - || die - - # turn off binreloc (not cached) - sed -i \ - -e 's#set(WITH_BINRELOC ON)#set(WITH_BINRELOC OFF)#' \ - CMakeLists.txt || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - for i in "${S}"/release/datafiles/locale/* ; do - mylang=${i##*/} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripting." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/blender-2.68.ebuild b/media-gfx/blender/blender-2.68.ebuild deleted file mode 100644 index ae237ffd74c6..000000000000 --- a/media-gfx/blender/blender-2.68.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.68.ebuild,v 1.4 2014/05/15 17:08:04 ulm Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_3 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gflags - dev-cpp/glog[gflags] - dev-python/numpy[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( media-libs/opencolorio ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - media-video/ffmpeg:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${P}-doxyfile.patch \ - "${FILESDIR}"/02-${P}-unbundle-colamd.patch \ - "${FILESDIR}"/03-${P}-remove-binreloc.patch \ - "${FILESDIR}"/04-${P}-unbundle-glog.patch \ - "${FILESDIR}"/05-${P}-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${P}-fix-install-rules.patch \ - "${FILESDIR}"/07-${P}-sse2.patch - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/binreloc \ - extern/libmv/third_party/{ldl,glog,gflags} \ - || die - - # turn off binreloc (not cached) - sed -i \ - -e 's#set(WITH_BINRELOC ON)#set(WITH_BINRELOC OFF)#' \ - CMakeLists.txt || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - for i in "${S}"/release/datafiles/locale/* ; do - mylang=${i##*/} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripting." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/blender-2.68a.ebuild b/media-gfx/blender/blender-2.68a.ebuild deleted file mode 100644 index 59ad93e9ea67..000000000000 --- a/media-gfx/blender/blender-2.68a.ebuild +++ /dev/null @@ -1,269 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.68a.ebuild,v 1.3 2014/05/15 17:08:04 ulm Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_3 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gflags - dev-cpp/glog[gflags] - dev-python/numpy[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( media-libs/opencolorio ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - media-video/ffmpeg:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ - "${FILESDIR}"/02-${PN}-2.68-unbundle-colamd.patch \ - "${FILESDIR}"/03-${PN}-2.68-remove-binreloc.patch \ - "${FILESDIR}"/04-${PN}-2.68-unbundle-glog.patch \ - "${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/07-${PN}-2.68-sse2.patch - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/binreloc \ - extern/libmv/third_party/{ldl,glog,gflags} \ - || die - - # turn off binreloc (not cached) - sed -i \ - -e 's#set(WITH_BINRELOC ON)#set(WITH_BINRELOC OFF)#' \ - CMakeLists.txt || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - for i in "${S}"/release/datafiles/locale/* ; do - mylang=${i##*/} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripting." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/blender-2.69.ebuild b/media-gfx/blender/blender-2.69.ebuild deleted file mode 100644 index b2c7e17cc95c..000000000000 --- a/media-gfx/blender/blender-2.69.ebuild +++ /dev/null @@ -1,270 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.69.ebuild,v 1.4 2014/05/15 17:08:04 ulm Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_3 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ffmpeg ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gflags - dev-cpp/glog[gflags] - dev-python/numpy[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( media-libs/opencolorio ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - media-video/ffmpeg:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( media-libs/openjpeg:0 ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ - "${FILESDIR}"/02-${PN}-2.68-unbundle-colamd.patch \ - "${FILESDIR}"/03-${PN}-2.68-remove-binreloc.patch \ - "${FILESDIR}"/04-${PN}-2.68-unbundle-glog.patch \ - "${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/07-${PN}-2.68-sse2.patch - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/binreloc \ - extern/libmv/third_party/{ldl,glog,gflags} \ - || die - - # turn off binreloc (not cached) - sed -i \ - -e 's#set(WITH_BINRELOC ON)#set(WITH_BINRELOC OFF)#' \ - CMakeLists.txt || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - for i in "${S}"/release/datafiles/locale/* ; do - mylang=${i##*/} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripting." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/blender-2.70-r1.ebuild b/media-gfx/blender/blender-2.70-r1.ebuild deleted file mode 100644 index fe8b4e2b36a5..000000000000 --- a/media-gfx/blender/blender-2.70-r1.ebuild +++ /dev/null @@ -1,267 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.70-r1.ebuild,v 1.2 2014/05/15 17:08:04 ulm Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_3 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ffmpeg ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gflags - dev-cpp/glog[gflags] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( media-libs/opencolorio ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - >=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( media-libs/openjpeg:0 ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openimageio? ( media-libs/openimageio ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ - "${FILESDIR}"/02-${PN}-2.68-unbundle-colamd.patch \ - "${FILESDIR}"/04-${PN}-2.70-unbundle-glog.patch \ - "${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/07-${PN}-2.70-sse2.patch - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/libmv/third_party/{glog,gflags} \ - || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - for i in "${S}"/release/datafiles/locale/* ; do - mylang=${i##*/} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openimageio OPENIMAGEIO) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with opennl OPENNL) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripting." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/blender-2.70.ebuild b/media-gfx/blender/blender-2.70.ebuild deleted file mode 100644 index 021262e593ce..000000000000 --- a/media-gfx/blender/blender-2.70.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.70.ebuild,v 1.2 2014/05/15 17:08:04 ulm Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_3 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ffmpeg ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gflags - dev-cpp/glog[gflags] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( media-libs/opencolorio ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - >=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( media-libs/openjpeg:0 ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openimageio? ( media-libs/openimageio ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ - "${FILESDIR}"/02-${PN}-2.68-unbundle-colamd.patch \ - "${FILESDIR}"/03-${PN}-2.68-remove-binreloc.patch \ - "${FILESDIR}"/04-${PN}-2.70-unbundle-glog.patch \ - "${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/07-${PN}-2.70-sse2.patch - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/binreloc \ - extern/libmv/third_party/{glog,gflags} \ - || die - - # turn off binreloc (not cached) - sed -i \ - -e 's#set(WITH_BINRELOC ON)#set(WITH_BINRELOC OFF)#' \ - CMakeLists.txt || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - for i in "${S}"/release/datafiles/locale/* ; do - mylang=${i##*/} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openimageio OPENIMAGEIO) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with opennl OPENNL) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripting." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/blender-2.70a-r3.ebuild b/media-gfx/blender/blender-2.70a-r3.ebuild deleted file mode 100644 index b4058ea19dba..000000000000 --- a/media-gfx/blender/blender-2.70a-r3.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.70a-r3.ebuild,v 1.2 2014/05/15 17:08:04 ulm Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_3 python3_4 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ffmpeg ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gflags - dev-cpp/glog[gflags] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( media-libs/opencolorio ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - >=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( media-libs/openjpeg:0 ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openimageio? ( media-libs/openimageio ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/${PN}-v${PV} - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ - "${FILESDIR}"/02-${PN}-2.68-unbundle-colamd.patch \ - "${FILESDIR}"/04-${PN}-2.70-unbundle-glog.patch \ - "${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/07-${PN}-2.70-sse2.patch \ - "${FILESDIR}"/${PN}-2.70a-openmp.patch - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/libmv/third_party/{glog,gflags} \ - || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - cd "${S}"/release/datafiles/locale/po - for i in *.po ; do - mylang=${i%.po} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openimageio OPENIMAGEIO) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with opennl OPENNL) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripting." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/blender-2.71-r1.ebuild b/media-gfx/blender/blender-2.71-r1.ebuild deleted file mode 100644 index 0cfd19146911..000000000000 --- a/media-gfx/blender/blender-2.71-r1.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.71-r1.ebuild,v 1.1 2014/07/16 15:31:42 hasufell Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_4 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ffmpeg ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/gflags-2.1.1-r1 - >=dev-cpp/glog-0.3.3-r1[gflags] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( <=media-libs/opencolorio-1.0.9 ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - >=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( media-libs/openjpeg:0 ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openimageio? ( media-libs/openimageio ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ - "${FILESDIR}"/02-${PN}-2.71-unbundle-colamd.patch \ - "${FILESDIR}"/04-${PN}-2.71-unbundle-glog.patch \ - "${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/07-${PN}-2.70-sse2.patch \ - "${FILESDIR}"/08-${PN}-2.71-gflags.patch - - epatch_user - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/libmv/third_party/{glog,gflags} \ - || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - cd "${S}"/release/datafiles/locale/po - for i in *.po ; do - mylang=${i%.po} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openimageio OPENIMAGEIO) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with opennl OPENNL) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripting." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/blender-2.71.ebuild b/media-gfx/blender/blender-2.71.ebuild deleted file mode 100644 index ff59c7d53ac9..000000000000 --- a/media-gfx/blender/blender-2.71.ebuild +++ /dev/null @@ -1,268 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.71.ebuild,v 1.1 2014/06/28 12:05:30 hasufell Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_4 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ffmpeg ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gflags - dev-cpp/glog[gflags] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( media-libs/opencolorio ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - >=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( media-libs/openjpeg:0 ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openimageio? ( media-libs/openimageio ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ - "${FILESDIR}"/02-${PN}-2.71-unbundle-colamd.patch \ - "${FILESDIR}"/04-${PN}-2.71-unbundle-glog.patch \ - "${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/07-${PN}-2.70-sse2.patch - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/libmv/third_party/{glog,gflags} \ - || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - cd "${S}"/release/datafiles/locale/po - for i in *.po ; do - mylang=${i%.po} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openimageio OPENIMAGEIO) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with opennl OPENNL) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripting." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/files/01-blender-2.67b-doxyfile.patch b/media-gfx/blender/files/01-blender-2.67b-doxyfile.patch deleted file mode 100644 index a8cbe7589163..000000000000 --- a/media-gfx/blender/files/01-blender-2.67b-doxyfile.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit eefa71abd4c13b28e0c42041240754c4ec1fda6e -Author: hasufell <hasufell@gentoo.org> -Date: Thu Jun 20 20:32:46 2013 +0200 - - remove hhc.exe reference - -diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile -index 8444ea7..745ab77 100644 ---- a/doc/doxygen/Doxyfile -+++ b/doc/doxygen/Doxyfile -@@ -952,7 +952,7 @@ CHM_FILE = blender.chm - # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run - # the HTML help compiler on the generated index.hhp. - --HHC_LOCATION = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe" -+HHC_LOCATION = - - # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag - # controls if a separate .chi index file is generated (YES) or that diff --git a/media-gfx/blender/files/02-blender-2.67b-unbundle-colamd.patch b/media-gfx/blender/files/02-blender-2.67b-unbundle-colamd.patch deleted file mode 100644 index 52c6e3d622e4..000000000000 --- a/media-gfx/blender/files/02-blender-2.67b-unbundle-colamd.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit 066ac461a3864a014623c8670593c67ca6aa7a76 -Author: hasufell <hasufell@gentoo.org> -Date: Thu Jun 20 20:35:34 2013 +0200 - - unbundle colamd - -diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt -index 941f69e..b21cdc3 100644 ---- a/extern/CMakeLists.txt -+++ b/extern/CMakeLists.txt -@@ -26,7 +26,6 @@ - # Otherwise we get warnings here that we cant fix in external projects - remove_strict_flags() - --add_subdirectory(colamd) - add_subdirectory(rangetree) - add_subdirectory(wcwidth) - -diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt -index c775f7d..c0b4e2d 100644 ---- a/source/blenderplayer/CMakeLists.txt -+++ b/source/blenderplayer/CMakeLists.txt -@@ -170,8 +170,6 @@ endif() - list(APPEND BLENDER_SORTED_LIBS extern_ceres) - endif() - -- list(APPEND BLENDER_SORTED_LIBS extern_colamd) -- - if(WITH_MOD_BOOLEAN) - list(APPEND BLENDER_SORTED_LIBS bf_intern_bsp) - list(APPEND BLENDER_SORTED_LIBS bf_intern_moto) -@@ -214,7 +212,7 @@ endif() - list(SORT REM_MSG) - message(STATUS "Player Skipping: (${REM_MSG})") - endif() -- target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS}) -+ target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS} colamd) - - unset(SEARCHLIB) - unset(SORTLIB) -diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt -index d5407fe..cd8106a 100644 ---- a/source/creator/CMakeLists.txt -+++ b/source/creator/CMakeLists.txt -@@ -900,7 +900,6 @@ endif() - bf_intern_smoke - extern_minilzo - extern_lzma -- extern_colamd - ge_logic_ketsji - extern_recastnavigation - ge_logic -@@ -1014,7 +1013,7 @@ endif() - list(SORT REM_MSG) - message(STATUS "Blender Skipping: (${REM_MSG})") - endif() -- target_link_libraries(blender ${BLENDER_SORTED_LIBS}) -+ target_link_libraries(blender ${BLENDER_SORTED_LIBS} colamd) - - unset(SEARCHLIB) - unset(SORTLIB) diff --git a/media-gfx/blender/files/03-blender-2.67b-remove-binreloc.patch b/media-gfx/blender/files/03-blender-2.67b-remove-binreloc.patch deleted file mode 100644 index 60409f5bc1b9..000000000000 --- a/media-gfx/blender/files/03-blender-2.67b-remove-binreloc.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 657d19a1107d6765fc7c7152d6becbd7fb422b6b -Author: hasufell <hasufell@gentoo.org> -Date: Thu Jun 20 20:36:41 2013 +0200 - - remove binreloc references - -diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt -index b21cdc3..1c8dfa1 100644 ---- a/extern/CMakeLists.txt -+++ b/extern/CMakeLists.txt -@@ -40,10 +40,6 @@ endif() - # add_subdirectory(eltopo) - #endif() - --if(WITH_BINRELOC) -- add_subdirectory(binreloc) --endif() -- - if(NOT WITH_SYSTEM_GLEW) - add_subdirectory(glew) - endif() -diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt -index c0b4e2d..261cbd2 100644 ---- a/source/blenderplayer/CMakeLists.txt -+++ b/source/blenderplayer/CMakeLists.txt -@@ -81,10 +81,6 @@ list(APPEND BLENDER_LINK_LIBS - blenkernel_blc - ) - --if(CMAKE_SYSTEM_NAME MATCHES "Linux") -- list(APPEND BLENDER_LINK_LIBS extern_binreloc) --endif() -- - # if(UNIX) - # Sort libraries - set(BLENDER_SORTED_LIBS diff --git a/media-gfx/blender/files/03-blender-2.68-remove-binreloc.patch b/media-gfx/blender/files/03-blender-2.68-remove-binreloc.patch deleted file mode 100644 index 84278a5dcc45..000000000000 --- a/media-gfx/blender/files/03-blender-2.68-remove-binreloc.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 6e212fef06cf18ce57a1f613e7c7a8e9ee72662e -Author: hasufell <hasufell@gentoo.org> -Date: Fri Jul 19 18:37:46 2013 +0200 - - remove binreloc references - -diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt -index 2b40c22..2823c7a 100644 ---- a/extern/CMakeLists.txt -+++ b/extern/CMakeLists.txt -@@ -41,10 +41,6 @@ endif() - # add_subdirectory(eltopo) - #endif() - --if(WITH_BINRELOC) -- add_subdirectory(binreloc) --endif() -- - if(NOT WITH_SYSTEM_GLEW) - add_subdirectory(glew) - endif() -diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt -index bc3baee..2fa78b9 100644 ---- a/source/blenderplayer/CMakeLists.txt -+++ b/source/blenderplayer/CMakeLists.txt -@@ -81,10 +81,6 @@ list(APPEND BLENDER_LINK_LIBS - blenkernel_blc - ) - --if(CMAKE_SYSTEM_NAME MATCHES "Linux") -- list(APPEND BLENDER_LINK_LIBS extern_binreloc) --endif() -- - # if(UNIX) - # Sort libraries - set(BLENDER_SORTED_LIBS diff --git a/media-gfx/blender/files/04-blender-2.67b-unbundle-glog.patch b/media-gfx/blender/files/04-blender-2.67b-unbundle-glog.patch deleted file mode 100644 index 1795661d954b..000000000000 --- a/media-gfx/blender/files/04-blender-2.67b-unbundle-glog.patch +++ /dev/null @@ -1,104 +0,0 @@ -commit 30edd34cfb066e8e238c95634c6bc92322e84475 -Author: hasufell <julian.ospald@googlemail.com> -Date: Thu Jun 20 21:00:49 2013 +0200 - - unbundle glog/gflags - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 40bf4d8..973bdcc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,6 +106,14 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE) - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE) - - #----------------------------------------------------------------------------- -+# Check for some modules -+if(UNIX) -+ find_package(PkgConfig) -+ pkg_check_modules(_PC_GFLAGS libgflags) -+ pkg_check_modules(_PC_GLOG libglog) -+endif() -+ -+#----------------------------------------------------------------------------- - # Set default config options - - get_blender_version() -diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt -index 025481f..5a0e8aa 100644 ---- a/extern/libmv/CMakeLists.txt -+++ b/extern/libmv/CMakeLists.txt -@@ -76,9 +76,6 @@ set(SRC - third_party/fast/fast_9.c - third_party/fast/fast.c - third_party/fast/nonmax.c -- third_party/gflags/gflags.cc -- third_party/gflags/gflags_completions.cc -- third_party/gflags/gflags_reporting.cc - - libmv-capi.h - libmv/base/id_generator.h -@@ -129,13 +126,6 @@ set(SRC - libmv/tracking/track_region.h - libmv/tracking/trklt_region_tracker.h - -- third_party/fast/fast.h -- third_party/gflags/config.h -- third_party/gflags/gflags/gflags_completions.h -- third_party/gflags/gflags/gflags_declare.h -- third_party/gflags/gflags/gflags.h -- third_party/gflags/mutex.h -- third_party/gflags/util.h - third_party/msinttypes/inttypes.h - third_party/msinttypes/stdint.h - ) -@@ -176,48 +166,14 @@ if(WIN32) - third_party/msinttypes - ) - endif() --else() -- list(APPEND SRC -- third_party/glog/src/demangle.cc -- third_party/glog/src/logging.cc -- third_party/glog/src/raw_logging.cc -- third_party/glog/src/signalhandler.cc -- third_party/glog/src/symbolize.cc -- third_party/glog/src/utilities.cc -- third_party/glog/src/vlog_is_on.cc -- -- third_party/glog/src/base/commandlineflags.h -- third_party/glog/src/base/googleinit.h -- third_party/glog/src/base/mutex.h -- third_party/glog/src/config_freebsd.h -- third_party/glog/src/config.h -- third_party/glog/src/config_hurd.h -- third_party/glog/src/config_linux.h -- third_party/glog/src/config_mac.h -- third_party/glog/src/demangle.h -- third_party/glog/src/glog/logging.h -- third_party/glog/src/glog/log_severity.h -- third_party/glog/src/glog/raw_logging.h -- third_party/glog/src/glog/vlog_is_on.h -- third_party/glog/src/stacktrace_generic-inl.h -- third_party/glog/src/stacktrace.h -- third_party/glog/src/stacktrace_libunwind-inl.h -- third_party/glog/src/stacktrace_powerpc-inl.h -- third_party/glog/src/stacktrace_x86_64-inl.h -- third_party/glog/src/stacktrace_x86-inl.h -- third_party/glog/src/symbolize.h -- third_party/glog/src/utilities.h -- ) -- -- list(APPEND INC -- third_party/glog/src -- ) - endif() - - add_definitions( - -DGOOGLE_GLOG_DLL_DECL= - ) - -+include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS}) - blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}") -+target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES}) - - add_subdirectory(third_party) diff --git a/media-gfx/blender/files/04-blender-2.70-unbundle-glog.patch b/media-gfx/blender/files/04-blender-2.70-unbundle-glog.patch deleted file mode 100644 index 4c9f14aea7c3..000000000000 --- a/media-gfx/blender/files/04-blender-2.70-unbundle-glog.patch +++ /dev/null @@ -1,106 +0,0 @@ -commit 26e853d31931a8bb08695aa98ae53b263236d407 -Author: hasufell <hasufell@gentoo.org> -Date: Fri Jul 19 18:40:23 2013 +0200 - - unbundle glog/gflags - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1a7830..a30831c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,6 +106,14 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE) - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE) - - #----------------------------------------------------------------------------- -+# Check for some modules -+if(UNIX) -+ find_package(PkgConfig) -+ pkg_check_modules(_PC_GFLAGS libgflags) -+ pkg_check_modules(_PC_GLOG libglog) -+endif() -+ -+#----------------------------------------------------------------------------- - # Set default config options - - get_blender_version() -diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt -index 2c9a219..7061e04 100644 ---- a/extern/libmv/CMakeLists.txt -+++ b/extern/libmv/CMakeLists.txt -@@ -87,10 +87,6 @@ - libmv/tracking/track_region.cc - libmv/tracking/trklt_region_tracker.cc - -- third_party/gflags/gflags.cc -- third_party/gflags/gflags_completions.cc -- third_party/gflags/gflags_reporting.cc -- - libmv/base/id_generator.h - libmv/base/scoped_ptr.h - libmv/base/vector.h -@@ -140,12 +136,6 @@ - libmv/tracking/track_region.h - libmv/tracking/trklt_region_tracker.h - -- third_party/gflags/config.h -- third_party/gflags/gflags/gflags_completions.h -- third_party/gflags/gflags/gflags_declare.h -- third_party/gflags/gflags/gflags.h -- third_party/gflags/mutex.h -- third_party/gflags/util.h - third_party/msinttypes/inttypes.h - third_party/msinttypes/stdint.h - ) -@@ -186,42 +176,6 @@ - third_party/msinttypes - ) - endif() -- else() -- list(APPEND SRC -- third_party/glog/src/demangle.cc -- third_party/glog/src/logging.cc -- third_party/glog/src/raw_logging.cc -- third_party/glog/src/signalhandler.cc -- third_party/glog/src/symbolize.cc -- third_party/glog/src/utilities.cc -- third_party/glog/src/vlog_is_on.cc -- -- third_party/glog/src/base/commandlineflags.h -- third_party/glog/src/base/googleinit.h -- third_party/glog/src/base/mutex.h -- third_party/glog/src/config_freebsd.h -- third_party/glog/src/config.h -- third_party/glog/src/config_hurd.h -- third_party/glog/src/config_linux.h -- third_party/glog/src/config_mac.h -- third_party/glog/src/demangle.h -- third_party/glog/src/glog/logging.h -- third_party/glog/src/glog/log_severity.h -- third_party/glog/src/glog/raw_logging.h -- third_party/glog/src/glog/vlog_is_on.h -- third_party/glog/src/stacktrace_generic-inl.h -- third_party/glog/src/stacktrace.h -- third_party/glog/src/stacktrace_libunwind-inl.h -- third_party/glog/src/stacktrace_powerpc-inl.h -- third_party/glog/src/stacktrace_x86_64-inl.h -- third_party/glog/src/stacktrace_x86-inl.h -- third_party/glog/src/symbolize.h -- third_party/glog/src/utilities.h -- ) -- -- list(APPEND INC -- third_party/glog/src -- ) - endif() - else() - list(APPEND SRC -@@ -229,7 +183,9 @@ - ) - endif() - -+include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS}) - blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}") -+target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES}) - - if(WITH_LIBMV) - add_subdirectory(third_party) diff --git a/media-gfx/blender/files/05-blender-2.67b-unbundle-eigen3.patch b/media-gfx/blender/files/05-blender-2.67b-unbundle-eigen3.patch deleted file mode 100644 index 27d55ed17d5f..000000000000 --- a/media-gfx/blender/files/05-blender-2.67b-unbundle-eigen3.patch +++ /dev/null @@ -1,561 +0,0 @@ -commit 346fda03d8f792ed441be329d709d1ff1a8c0cb5 -Author: hasufell <julian.ospald@googlemail.com> -Date: Thu Jun 20 21:15:09 2013 +0200 - - unbundle Eigen3 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 973bdcc..44ce1c3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -109,6 +109,7 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE) - # Check for some modules - if(UNIX) - find_package(PkgConfig) -+ pkg_check_modules(_PC_EIGEN3 eigen3) - pkg_check_modules(_PC_GFLAGS libgflags) - pkg_check_modules(_PC_GLOG libglog) - endif() -diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt -index 5a0e8aa..bdee259 100644 ---- a/extern/libmv/CMakeLists.txt -+++ b/extern/libmv/CMakeLists.txt -@@ -32,7 +32,7 @@ set(INC - ) - - set(INC_SYS -- ../Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ${PNG_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIRS} - ) -diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt -index 0645883..d79fe9e 100644 ---- a/extern/libmv/third_party/ceres/CMakeLists.txt -+++ b/extern/libmv/third_party/ceres/CMakeLists.txt -@@ -35,7 +35,7 @@ set(INC - ) - - set(INC_SYS -- ../../../Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ) - - set(SRC -diff --git a/intern/dualcon/CMakeLists.txt b/intern/dualcon/CMakeLists.txt -index da5e10f..a4aae1b 100644 ---- a/intern/dualcon/CMakeLists.txt -+++ b/intern/dualcon/CMakeLists.txt -@@ -22,7 +22,7 @@ set(INC - ) - - set(INC_SYS -- ../../extern/Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ) - - set(SRC -diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt -index bc3ea0c..f5dec1a 100644 ---- a/intern/itasc/CMakeLists.txt -+++ b/intern/itasc/CMakeLists.txt -@@ -28,7 +28,7 @@ set(INC - ) - - set(INC_SYS -- ../../extern/Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ) - - set(SRC -@@ -121,235 +121,235 @@ set(SRC - kdl/framevel.inl - - # until we have another user... -- ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h -- ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h -- ../../extern/Eigen3/Eigen/src/Cholesky/LLT_MKL.h -- ../../extern/Eigen3/Eigen/src/CholmodSupport/CholmodSupport.h -- ../../extern/Eigen3/Eigen/src/Core/Array.h -- ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h -- ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h -- ../../extern/Eigen3/Eigen/src/Core/Assign.h -- ../../extern/Eigen3/Eigen/src/Core/Assign_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/Block.h -- ../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h -- ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h -- ../../extern/Eigen3/Eigen/src/Core/DenseBase.h -- ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h -- ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h -- ../../extern/Eigen3/Eigen/src/Core/Diagonal.h -- ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h -- ../../extern/Eigen3/Eigen/src/Core/Dot.h -- ../../extern/Eigen3/Eigen/src/Core/EigenBase.h -- ../../extern/Eigen3/Eigen/src/Core/Flagged.h -- ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h -- ../../extern/Eigen3/Eigen/src/Core/Functors.h -- ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h -- ../../extern/Eigen3/Eigen/src/Core/GeneralProduct.h -- ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h -- ../../extern/Eigen3/Eigen/src/Core/IO.h -- ../../extern/Eigen3/Eigen/src/Core/Map.h -- ../../extern/Eigen3/Eigen/src/Core/MapBase.h -- ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h -- ../../extern/Eigen3/Eigen/src/Core/Matrix.h -- ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h -- ../../extern/Eigen3/Eigen/src/Core/NestByValue.h -- ../../extern/Eigen3/Eigen/src/Core/NoAlias.h -- ../../extern/Eigen3/Eigen/src/Core/NumTraits.h -- ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h -- ../../extern/Eigen3/Eigen/src/Core/Product.h -- ../../extern/Eigen3/Eigen/src/Core/ProductBase.h -- ../../extern/Eigen3/Eigen/src/Core/Random.h -- ../../extern/Eigen3/Eigen/src/Core/Redux.h -- ../../extern/Eigen3/Eigen/src/Core/Replicate.h -- ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h -- ../../extern/Eigen3/Eigen/src/Core/Reverse.h -- ../../extern/Eigen3/Eigen/src/Core/Select.h -- ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h -- ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h -- ../../extern/Eigen3/Eigen/src/Core/StableNorm.h -- ../../extern/Eigen3/Eigen/src/Core/Stride.h -- ../../extern/Eigen3/Eigen/src/Core/Swap.h -- ../../extern/Eigen3/Eigen/src/Core/Transpose.h -- ../../extern/Eigen3/Eigen/src/Core/Transpositions.h -- ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h -- ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h -- ../../extern/Eigen3/Eigen/src/Core/Visitor.h -- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h -- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h -- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h -- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h -- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h -- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h -- ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h -- ../../extern/Eigen3/Eigen/src/Core/util/Constants.h -- ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h -- ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h -- ../../extern/Eigen3/Eigen/src/Core/util/Macros.h -- ../../extern/Eigen3/Eigen/src/Core/util/Memory.h -- ../../extern/Eigen3/Eigen/src/Core/util/Meta.h -- ../../extern/Eigen3/Eigen/src/Core/util/MKL_support.h -- ../../extern/Eigen3/Eigen/src/Core/util/NonMPL2.h -- ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h -- ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h -- ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur_MKL.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur_MKL.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h -- ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h -- ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h -- ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h -- ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h -- ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h -- ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h -- ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h -- ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h -- ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h -- ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h -- ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h -- ../../extern/Eigen3/Eigen/src/Geometry/Transform.h -- ../../extern/Eigen3/Eigen/src/Geometry/Translation.h -- ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h -- ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h -- ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h -- ../../extern/Eigen3/Eigen/src/Householder/Householder.h -- ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h -- ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h -- ../../extern/Eigen3/Eigen/src/LU/Determinant.h -- ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h -- ../../extern/Eigen3/Eigen/src/LU/Inverse.h -- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h -- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU_MKL.h -- ../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h -- ../../extern/Eigen3/Eigen/src/misc/blas.h -- ../../extern/Eigen3/Eigen/src/misc/Image.h -- ../../extern/Eigen3/Eigen/src/misc/Kernel.h -- ../../extern/Eigen3/Eigen/src/misc/Solve.h -- ../../extern/Eigen3/Eigen/src/misc/SparseSolve.h -- ../../extern/Eigen3/Eigen/src/OrderingMethods/Amd.h -- ../../extern/Eigen3/Eigen/src/PardisoSupport/PardisoSupport.h -- ../../extern/Eigen3/Eigen/src/PaStiXSupport/PaStiXSupport.h -- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h -- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h -- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h -- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR_MKL.h -- ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h -- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h -- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR_MKL.h -- ../../extern/Eigen3/Eigen/src/SparseCholesky/SimplicialCholesky.h -- ../../extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h -- ../../extern/Eigen3/Eigen/src/SparseCore/CompressedStorage.h -- ../../extern/Eigen3/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h -- ../../extern/Eigen3/Eigen/src/SparseCore/CoreIterators.h -- ../../extern/Eigen3/Eigen/src/SparseCore/MappedSparseMatrix.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseAssign.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseBlock.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseBinaryOp.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseUnaryOp.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseDenseProduct.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseDiagonalProduct.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseDot.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseFuzzy.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrix.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrixBase.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparsePermutation.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseProduct.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseRedux.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseSparseProductWithPruning.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseTranspose.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseTriangularView.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseUtil.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseVector.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseView.h -- ../../extern/Eigen3/Eigen/src/SparseCore/TriangularSolver.h -- ../../extern/Eigen3/Eigen/src/StlSupport/details.h -- ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h -- ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h -- ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h -- ../../extern/Eigen3/Eigen/src/SuperLUSupport/SuperLUSupport.h -- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h -- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD_MKL.h -- ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h -- ../../extern/Eigen3/Eigen/src/UmfPackSupport/UmfPackSupport.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Cholesky/LDLT.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Cholesky/LLT.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Cholesky/LLT_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/CholmodSupport/CholmodSupport.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Array.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ArrayBase.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ArrayWrapper.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Assign.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Assign_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/BandMatrix.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Block.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/BooleanRedux.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CommaInitializer.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CwiseBinaryOp.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CwiseNullaryOp.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CwiseUnaryOp.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/CwiseUnaryView.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DenseBase.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DenseCoeffsBase.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DenseStorage.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Diagonal.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DiagonalMatrix.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/DiagonalProduct.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Dot.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/EigenBase.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Flagged.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ForceAlignedAccess.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Functors.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Fuzzy.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/GeneralProduct.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/GenericPacketMath.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/GlobalFunctions.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/IO.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Map.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/MapBase.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/MathFunctions.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Matrix.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/MatrixBase.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/NestByValue.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/NoAlias.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/NumTraits.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/PermutationMatrix.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/PlainObjectBase.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Product.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ProductBase.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Random.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Redux.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Replicate.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/ReturnByValue.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Reverse.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Select.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/SelfAdjointView.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/SelfCwiseBinaryOp.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/SolveTriangular.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/StableNorm.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Stride.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Swap.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Transpose.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Transpositions.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/TriangularMatrix.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/VectorBlock.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/VectorwiseOp.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/Visitor.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/AltiVec/Complex.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/AltiVec/PacketMath.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/Default/Settings.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/NEON/Complex.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/NEON/PacketMath.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/SSE/Complex.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/SSE/MathFunctions.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/arch/SSE/PacketMath.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/CoeffBasedProduct.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralBlockPanelKernel.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixMatrix.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixVector.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/GeneralMatrixVector_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/Parallelizer.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointMatrixMatrix.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointMatrixVector.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointProduct.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/SelfadjointRank2Update.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularMatrixMatrix.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularMatrixVector.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularMatrixVector_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularSolverMatrix.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/products/TriangularSolverVector.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/BlasUtil.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/Constants.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/DisableStupidWarnings.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/ForwardDeclarations.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/Macros.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/Memory.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/Meta.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/MKL_support.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/NonMPL2.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/ReenableStupidWarnings.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/StaticAssert.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Core/util/XprHelper.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Block.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Cwise.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/CwiseOperators.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Lazy.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/LeastSquares.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/LU.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Macros.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/MathFunctions.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Memory.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Meta.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Minor.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/QR.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/SVD.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/TriangularSolver.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/VectorBlock.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/AlignedBox.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/All.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/AngleAxis.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Hyperplane.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Quaternion.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Rotation2D.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/RotationBase.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Scaling.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Transform.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigen2Support/Geometry/Translation.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/ComplexEigenSolver.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/ComplexSchur.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/ComplexSchur_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/EigenSolver.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/HessenbergDecomposition.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/RealSchur.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/RealSchur_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Eigenvalues/Tridiagonalization.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/AlignedBox.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/AngleAxis.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/EulerAngles.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Homogeneous.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Hyperplane.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/OrthoMethods.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/ParametrizedLine.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Quaternion.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Rotation2D.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/RotationBase.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Scaling.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Transform.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Translation.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/Umeyama.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Geometry/arch/Geometry_SSE.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Householder/BlockHouseholder.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Householder/Householder.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Householder/HouseholderSequence.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/Jacobi/Jacobi.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/Determinant.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/FullPivLU.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/Inverse.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/PartialPivLU.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/PartialPivLU_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/LU/arch/Inverse_SSE.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/blas.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/Image.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/Kernel.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/Solve.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/misc/SparseSolve.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/OrderingMethods/Amd.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/PardisoSupport/PardisoSupport.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/PaStiXSupport/PaStiXSupport.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/ArrayCwiseBinaryOps.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/ArrayCwiseUnaryOps.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/BlockMethods.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/CommonCwiseBinaryOps.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/CommonCwiseUnaryOps.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/MatrixCwiseBinaryOps.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/plugins/MatrixCwiseUnaryOps.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/ColPivHouseholderQR.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/ColPivHouseholderQR_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/FullPivHouseholderQR.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/HouseholderQR.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/QR/HouseholderQR_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCholesky/SimplicialCholesky.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/AmbiVector.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/CompressedStorage.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/CoreIterators.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/MappedSparseMatrix.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseAssign.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseBlock.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseCwiseBinaryOp.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseCwiseUnaryOp.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseDenseProduct.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseDiagonalProduct.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseDot.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseFuzzy.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseMatrix.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseMatrixBase.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparsePermutation.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseProduct.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseRedux.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseSelfAdjointView.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseSparseProductWithPruning.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseTranspose.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseTriangularView.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseUtil.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseVector.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/SparseView.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SparseCore/TriangularSolver.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/StlSupport/details.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/StlSupport/StdDeque.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/StlSupport/StdList.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/StlSupport/StdVector.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SuperLUSupport/SuperLUSupport.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SVD/JacobiSVD.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SVD/JacobiSVD_MKL.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/SVD/UpperBidiagonalization.h -+ ${_PC_EIGEN3_INCLUDE_DIRS}/Eigen/src/UmfPackSupport/UmfPackSupport.h - ) - - -diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt -index 0a0e0e6..45fe6c9 100644 ---- a/source/blender/ikplugin/CMakeLists.txt -+++ b/source/blender/ikplugin/CMakeLists.txt -@@ -59,7 +59,7 @@ if(WITH_IK_ITASC) - ../../../intern/itasc - ) - list(APPEND INC_SYS -- ../../../extern/Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ) - list(APPEND SRC - intern/itasc_plugin.cpp -diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt -index f18646c..b649328 100644 ---- a/source/gameengine/Converter/CMakeLists.txt -+++ b/source/gameengine/Converter/CMakeLists.txt -@@ -57,7 +57,7 @@ set(INC - - set(INC_SYS - ../../../extern/recastnavigation/Detour/Include -- ../../../extern/Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ${PTHREADS_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIR} - ) diff --git a/media-gfx/blender/files/06-blender-2.67b-fix-install-rules.patch b/media-gfx/blender/files/06-blender-2.67b-fix-install-rules.patch deleted file mode 100644 index 260f10a7c7fa..000000000000 --- a/media-gfx/blender/files/06-blender-2.67b-fix-install-rules.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit c8f101e4cca0092645070480c2837c446894f305 -Author: hasufell <hasufell@gentoo.org> -Date: Thu Jun 20 20:38:23 2013 +0200 - - remove stupid uninstall snippet - - whoever coded this... it is dangerous - uninstall methods have NO PLACE in install rules - -diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt -index cd8106a..3a54dd0 100644 ---- a/source/creator/CMakeLists.txt -+++ b/source/creator/CMakeLists.txt -@@ -268,12 +268,6 @@ endif() - # Install Targets (Generic, All Platforms) - - --# important to make a clean install each time, else old scripts get loaded. --install( -- CODE -- "file(REMOVE_RECURSE ${TARGETDIR_VER})" --) -- - if(WITH_PYTHON) - # install(CODE "message(\"copying blender scripts...\")") - diff --git a/media-gfx/blender/files/07-blender-2.67b-sse2.patch b/media-gfx/blender/files/07-blender-2.67b-sse2.patch deleted file mode 100644 index bbf7a3116496..000000000000 --- a/media-gfx/blender/files/07-blender-2.67b-sse2.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 824e0f9182059d2d2694167606da7abd536e22c8 -Author: hasufell <hasufell@gentoo.org> -Date: Fri Jun 21 16:17:40 2013 +0200 - - add option to explicitly control sse2 optimization - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 44ce1c3..f6fc3b8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -86,6 +86,7 @@ cmake_policy(SET CMP0014 NEW) - #----------------------------------------------------------------------------- - # Load some macros. - include(build_files/cmake/macros.cmake) -+include(CMakeDependentOption) - - - #----------------------------------------------------------------------------- -@@ -255,6 +256,7 @@ option(WITH_FREESTYLE "Enable Freestyle (advanced edges rendering)" ON) - # Misc - option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON) - option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON) -+cmake_dependent_option(WITH_SSE2 "SSE2 optimizations" ON WITH_RAYOPTIMIZATION OFF) - if(UNIX AND NOT APPLE) - option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON) - option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF) -@@ -1804,7 +1806,7 @@ if(WITH_RAYOPTIMIZATION) - set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}") - add_definitions(-D__SSE__ -D__MMX__) - endif() -- if(SUPPORT_SSE2_BUILD) -+ if(WITH_SSE2 AND SUPPORT_SSE2_BUILD) - set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}") - add_definitions(-D__SSE2__) - if(NOT SUPPORT_SSE_BUILD) # dont double up diff --git a/media-gfx/blender/files/blender-2.66-cmake.patch b/media-gfx/blender/files/blender-2.66-cmake.patch deleted file mode 100644 index 9c30dba67fb1..000000000000 --- a/media-gfx/blender/files/blender-2.66-cmake.patch +++ /dev/null @@ -1,15 +0,0 @@ -to upstream: this is a really stupid idea - ---- blender-2.66/source/creator/CMakeLists.txt -+++ blender-2.66/source/creator/CMakeLists.txt -@@ -264,10 +264,6 @@ - - - # important to make a clean install each time, else old scripts get loaded. --install( -- CODE -- "file(REMOVE_RECURSE ${TARGETDIR_VER})" --) - - if(WITH_PYTHON) - # install(CODE "message(\"copying blender scripts...\")") diff --git a/media-gfx/blender/files/blender-2.66-doxyfile.patch b/media-gfx/blender/files/blender-2.66-doxyfile.patch deleted file mode 100644 index 6114c29dda62..000000000000 --- a/media-gfx/blender/files/blender-2.66-doxyfile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- blender-2.66/doc/doxygen/Doxyfile -+++ blender-2.66/doc/doxygen/Doxyfile -@@ -952,7 +952,7 @@ - # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run - # the HTML help compiler on the generated index.hhp. - --HHC_LOCATION = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe" -+HHC_LOCATION = - - # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag - # controls if a separate .chi index file is generated (YES) or that diff --git a/media-gfx/blender/files/blender-2.66-sse2.patch b/media-gfx/blender/files/blender-2.66-sse2.patch deleted file mode 100644 index a51e5e4a845c..000000000000 --- a/media-gfx/blender/files/blender-2.66-sse2.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- blender-2.66/CMakeLists.txt -+++ blender-2.66/CMakeLists.txt -@@ -86,6 +86,7 @@ - #----------------------------------------------------------------------------- - # Load some macros. - include(build_files/cmake/macros.cmake) -+include(CMakeDependentOption) - - - #----------------------------------------------------------------------------- -@@ -236,6 +237,7 @@ - # Misc - option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON) - option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON) -+cmake_dependent_option(WITH_SSE2 "SSE2 optimizations" ON WITH_RAYOPTIMIZATION OFF) - if(UNIX AND NOT APPLE) - option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON) - option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF) -@@ -1767,7 +1769,7 @@ - set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}") - add_definitions(-D__SSE__ -D__MMX__) - endif() -- if(SUPPORT_SSE2_BUILD) -+ if(WITH_SSE2 AND SUPPORT_SSE2_BUILD) - set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}") - add_definitions(-D__SSE2__) - if(NOT SUPPORT_SSE_BUILD) # dont double up diff --git a/media-gfx/blender/files/blender-2.66-unbundle.patch b/media-gfx/blender/files/blender-2.66-unbundle.patch deleted file mode 100644 index 7941e63a0dbf..000000000000 --- a/media-gfx/blender/files/blender-2.66-unbundle.patch +++ /dev/null @@ -1,212 +0,0 @@ ---- blender-2.66/extern/CMakeLists.txt -+++ blender-2.66/extern/CMakeLists.txt -@@ -26,7 +26,6 @@ - # Otherwise we get warnings here that we cant fix in external projects - remove_strict_flags() - --add_subdirectory(colamd) - add_subdirectory(rangetree) - - if(WITH_BULLET) -@@ -40,10 +39,6 @@ - # add_subdirectory(eltopo) - #endif() - --if(WITH_BINRELOC) -- add_subdirectory(binreloc) --endif() -- - if(NOT WITH_SYSTEM_GLEW) - add_subdirectory(glew) - endif() ---- blender-2.66/extern/libmv/CMakeLists.txt -+++ blender-2.66/extern/libmv/CMakeLists.txt -@@ -26,6 +26,12 @@ - # If you're doing changes in this file, please update template - # in that script too - -+if(UNIX) -+ find_package(PkgConfig) -+ pkg_check_modules(_PC_GFLAGS libgflags) -+ pkg_check_modules(_PC_GLOG libglog) -+endif() -+ - set(INC - . - ../colamd/Include -@@ -79,9 +85,6 @@ - third_party/fast/fast_9.c - third_party/fast/fast.c - third_party/fast/nonmax.c -- third_party/gflags/gflags.cc -- third_party/gflags/gflags_completions.cc -- third_party/gflags/gflags_reporting.cc - - libmv-capi.h - libmv/base/id_generator.h -@@ -132,13 +135,6 @@ - libmv/tracking/track_region.h - libmv/tracking/trklt_region_tracker.h - -- third_party/fast/fast.h -- third_party/gflags/config.h -- third_party/gflags/gflags/gflags_completions.h -- third_party/gflags/gflags/gflags_declare.h -- third_party/gflags/gflags/gflags.h -- third_party/gflags/mutex.h -- third_party/gflags/util.h - third_party/msinttypes/inttypes.h - third_party/msinttypes/stdint.h - ) -@@ -179,42 +175,6 @@ - third_party/msinttypes - ) - endif() --else() -- list(APPEND SRC -- third_party/glog/src/demangle.cc -- third_party/glog/src/logging.cc -- third_party/glog/src/raw_logging.cc -- third_party/glog/src/signalhandler.cc -- third_party/glog/src/symbolize.cc -- third_party/glog/src/utilities.cc -- third_party/glog/src/vlog_is_on.cc -- -- third_party/glog/src/base/commandlineflags.h -- third_party/glog/src/base/googleinit.h -- third_party/glog/src/base/mutex.h -- third_party/glog/src/config_freebsd.h -- third_party/glog/src/config.h -- third_party/glog/src/config_hurd.h -- third_party/glog/src/config_linux.h -- third_party/glog/src/config_mac.h -- third_party/glog/src/demangle.h -- third_party/glog/src/glog/logging.h -- third_party/glog/src/glog/log_severity.h -- third_party/glog/src/glog/raw_logging.h -- third_party/glog/src/glog/vlog_is_on.h -- third_party/glog/src/stacktrace_generic-inl.h -- third_party/glog/src/stacktrace.h -- third_party/glog/src/stacktrace_libunwind-inl.h -- third_party/glog/src/stacktrace_powerpc-inl.h -- third_party/glog/src/stacktrace_x86_64-inl.h -- third_party/glog/src/stacktrace_x86-inl.h -- third_party/glog/src/symbolize.h -- third_party/glog/src/utilities.h -- ) -- -- list(APPEND INC -- third_party/glog/src -- ) - endif() - - add_definitions( -@@ -222,6 +182,8 @@ - -DGOOGLE_GLOG_DLL_DECL= - ) - -+include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS}) - blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}") -+target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES}) - - add_subdirectory(third_party) ---- blender-2.66/extern/libmv/third_party/ssba/CMakeLists.txt -+++ blender-2.66/extern/libmv/third_party/ssba/CMakeLists.txt -@@ -22,10 +22,13 @@ - # - # ***** END GPL LICENSE BLOCK ***** - -+if(UNIX) -+ find_package(PkgConfig) -+ pkg_check_modules(_PC_LDL ldl) -+endif() -+ - set(INC - . -- ../ldl/Include -- ../../../colamd/Include - ) - - set(INC_SYS -@@ -42,9 +45,6 @@ - Math/v3d_linear_utils.h - Math/v3d_mathutilities.h - Math/v3d_optimization.h -- -- ../ldl/Source/ldl.c -- ../ldl/Include/ldl.h - ) - - if(WIN32) -@@ -61,4 +61,6 @@ - -DV3DLIB_ENABLE_SUITESPARSE - ) - -+include_directories(${_PC_LDL_INCLUDE_DIRS}) - blender_add_lib(extern_ssba "${SRC}" "${INC}" "${INC_SYS}") -+target_link_libraries(extern_ssba ${_PC_LDL_LIBRARIES}) ---- blender-2.66/extern/libmv/libmv-capi.cpp -+++ blender-2.66/extern/libmv/libmv-capi.cpp -@@ -34,7 +34,7 @@ - - #include "libmv-capi.h" - --#include "third_party/gflags/gflags/gflags.h" -+#include <gflags/gflags.h> - #include "glog/logging.h" - #include "libmv/logging/logging.h" - ---- blender-2.66/source/creator/CMakeLists.txt -+++ blender-2.66/source/creator/CMakeLists.txt -@@ -881,7 +881,6 @@ - bf_intern_smoke - extern_minilzo - extern_lzma -- extern_colamd - ge_logic_ketsji - extern_recastnavigation - ge_phys_common -@@ -995,8 +994,8 @@ - if(REM_MSG) - list(SORT REM_MSG) - message(STATUS "Blender Skipping: (${REM_MSG})") -- endif() -- target_link_libraries(blender ${BLENDER_SORTED_LIBS}) -+ endif() -+ target_link_libraries(blender ${BLENDER_SORTED_LIBS} colamd) - - unset(SEARCHLIB) - unset(SORTLIB) ---- blender-2.66/source/blenderplayer/CMakeLists.txt -+++ blender-2.66/source/blenderplayer/CMakeLists.txt -@@ -81,10 +81,6 @@ - blenkernel_blc - ) - --if(CMAKE_SYSTEM_NAME MATCHES "Linux") -- list(APPEND BLENDER_LINK_LIBS extern_binreloc) --endif() -- - # if(UNIX) - # Sort libraries - set(BLENDER_SORTED_LIBS -@@ -171,8 +167,6 @@ - list(APPEND BLENDER_SORTED_LIBS extern_ceres) - endif() - -- list(APPEND BLENDER_SORTED_LIBS extern_colamd) -- - if(WITH_MOD_BOOLEAN) - list(APPEND BLENDER_SORTED_LIBS bf_intern_bsp) - list(APPEND BLENDER_SORTED_LIBS bf_intern_moto) -@@ -215,8 +209,8 @@ - list(SORT REM_MSG) - message(STATUS "Player Skipping: (${REM_MSG})") - endif() -- target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS}) -- -+ target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS} colamd) -+ - unset(SEARCHLIB) - unset(SORTLIB) - unset(REMLIB) diff --git a/media-gfx/blender/files/blender-2.70a-openmp.patch b/media-gfx/blender/files/blender-2.70a-openmp.patch deleted file mode 100644 index 2c2afde12437..000000000000 --- a/media-gfx/blender/files/blender-2.70a-openmp.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Fri Apr 18 21:42:45 UTC 2014 -Subject: fix unguarded calls to omp_get_thread_num() - ---- blender-v2.70a/source/blender/editors/sculpt_paint/paint_cursor.c -+++ blender-v2.70a/source/blender/editors/sculpt_paint/paint_cursor.c -@@ -248,8 +248,13 @@ static int load_tex(Brush *br, ViewConte - - if (col) { - float rgba[4]; -- -- paint_get_tex_pixel_col(mtex, x, y, rgba, pool, omp_get_thread_num()); -+ int thread_num; -+#ifdef _OPENMP -+ thread_num = omp_get_thread_num(); -+#else -+ thread_num = 0; -+#endif -+ paint_get_tex_pixel_col(mtex, x, y, rgba, pool, thread_num); - - buffer[index * 4] = rgba[0] * 255; - buffer[index * 4 + 1] = rgba[1] * 255; -@@ -257,7 +262,14 @@ static int load_tex(Brush *br, ViewConte - buffer[index * 4 + 3] = rgba[3] * 255; - } - else { -- float avg = paint_get_tex_pixel(mtex, x, y, pool, omp_get_thread_num()); -+ float avg; -+ int thread_num; -+#ifdef _OPENMP -+ thread_num = omp_get_thread_num(); -+#else -+ thread_num = 0; -+#endif -+ avg = paint_get_tex_pixel(mtex, x, y, pool, thread_num); - - avg += br->texture_sample_bias; - |