summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthoine Bourgeois <anthoine.bourgeois@gmail.com>2017-02-26 22:02:58 +0100
committerAnthoine Bourgeois <anthoine.bourgeois@gmail.com>2017-02-26 22:02:58 +0100
commit62de1e3a3ec6b66cff6667c1b93efdbf949cac6c (patch)
tree6334094a89551dbcc940c44388c488d1ab9f8a70
parent+spacenavd-0.6.ebuild (diff)
downloadaluco-62de1e3a3ec6b66cff6667c1b93efdbf949cac6c.tar.gz
aluco-62de1e3a3ec6b66cff6667c1b93efdbf949cac6c.tar.bz2
aluco-62de1e3a3ec6b66cff6667c1b93efdbf949cac6c.zip
blender: remove all ebuilds to fix bug#610130
ebuilds using deprecated python.eclass
-rw-r--r--media-gfx/blender/Manifest73
-rw-r--r--media-gfx/blender/blender-2.60a.ebuild441
-rw-r--r--media-gfx/blender/blender-2.61-r1.ebuild425
-rw-r--r--media-gfx/blender/blender-2.61-r2.ebuild410
-rw-r--r--media-gfx/blender/blender-2.61-r3.ebuild437
-rw-r--r--media-gfx/blender/blender-2.61-r4.ebuild438
-rw-r--r--media-gfx/blender/blender-2.61-r5.ebuild446
-rw-r--r--media-gfx/blender/blender-2.61.ebuild449
-rw-r--r--media-gfx/blender/blender-2.62-r1.ebuild449
-rw-r--r--media-gfx/blender/blender-2.62-r2.ebuild450
-rw-r--r--media-gfx/blender/blender-2.62.ebuild446
-rw-r--r--media-gfx/blender/blender-2.63.ebuild447
-rw-r--r--media-gfx/blender/blender-2.63a-r1.ebuild445
-rw-r--r--media-gfx/blender/blender-2.63a.ebuild446
-rw-r--r--media-gfx/blender/files/blender-2.60-bmake.patch114
-rw-r--r--media-gfx/blender/files/blender-2.60-bullet.patch192
-rw-r--r--media-gfx/blender/files/blender-2.60-colamd.patch204
-rw-r--r--media-gfx/blender/files/blender-2.60-doxyfile.patch11
-rw-r--r--media-gfx/blender/files/blender-2.60-eigen.patch293
-rw-r--r--media-gfx/blender/files/blender-2.60-glew.patch48
-rw-r--r--media-gfx/blender/files/blender-2.60-libav-0.7.patch30
-rw-r--r--media-gfx/blender/files/blender-2.60-linux-3.patch12
-rw-r--r--media-gfx/blender/files/blender-2.60-openjpeg.patch37
-rw-r--r--media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch149
-rw-r--r--media-gfx/blender/files/blender-2.60a-cmake.patch67
-rw-r--r--media-gfx/blender/files/blender-2.60a-desktop.patch20
-rw-r--r--media-gfx/blender/files/blender-2.60a-enable_site_module.patch32
-rw-r--r--media-gfx/blender/files/blender-2.60a-insecure.desktop15
-rw-r--r--media-gfx/blender/files/blender-2.60a-libav-0.7.patch30
-rw-r--r--media-gfx/blender/files/blender-2.60a-linux-3.patch12
-rw-r--r--media-gfx/blender/files/blender-2.61-CVE-2009-3850-v3.patch146
-rw-r--r--media-gfx/blender/files/blender-2.61-CVE-2009-3850-v4.patch164
-rw-r--r--media-gfx/blender/files/blender-2.61-collada.patch11
-rw-r--r--media-gfx/blender/files/blender-2.61-desktop.patch20
-rw-r--r--media-gfx/blender/files/blender-2.61-eigen.patch543
-rw-r--r--media-gfx/blender/files/blender-2.61-enable_site_module.patch31
-rw-r--r--media-gfx/blender/files/blender-2.61-glew.patch44
-rw-r--r--media-gfx/blender/files/blender-2.61-insecure.desktop15
-rw-r--r--media-gfx/blender/files/blender-2.61-opencollada-debug.patch15
-rw-r--r--media-gfx/blender/files/blender-2.62-CVE-2009-3850-v4.patch164
-rw-r--r--media-gfx/blender/files/blender-2.62-colamd.patch198
-rw-r--r--media-gfx/blender/files/blender-2.62-collada.patch11
-rw-r--r--media-gfx/blender/files/blender-2.62-desktop.patch20
-rw-r--r--media-gfx/blender/files/blender-2.62-doxyfile.patch11
-rw-r--r--media-gfx/blender/files/blender-2.62-eigen.patch555
-rw-r--r--media-gfx/blender/files/blender-2.62-enable_site_module.patch34
-rw-r--r--media-gfx/blender/files/blender-2.62-glew.patch49
-rw-r--r--media-gfx/blender/files/blender-2.62-insecure.desktop15
-rw-r--r--media-gfx/blender/files/blender-2.62-jp2.patch13
-rw-r--r--media-gfx/blender/files/blender-2.62-opencollada-debug.patch15
-rw-r--r--media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch164
-rw-r--r--media-gfx/blender/files/blender-2.63-bullet.patch193
-rw-r--r--media-gfx/blender/files/blender-2.63-colamd.patch199
-rw-r--r--media-gfx/blender/files/blender-2.63-collada.patch11
-rw-r--r--media-gfx/blender/files/blender-2.63-desktop.patch22
-rw-r--r--media-gfx/blender/files/blender-2.63-doxyfile.patch13
-rw-r--r--media-gfx/blender/files/blender-2.63-eigen.patch556
-rw-r--r--media-gfx/blender/files/blender-2.63-enable_site_module.patch34
-rw-r--r--media-gfx/blender/files/blender-2.63-glew.patch49
-rw-r--r--media-gfx/blender/files/blender-2.63-insecure.desktop17
-rw-r--r--media-gfx/blender/files/blender-2.63-opencollada-debug.patch15
-rw-r--r--media-gfx/blender/files/blender-2.63a-bullet.patch191
-rw-r--r--media-gfx/blender/files/blender-2.63a-colamd.patch198
-rw-r--r--media-gfx/blender/files/blender-2.63a-collada.patch11
-rw-r--r--media-gfx/blender/files/blender-2.63a-desktop.patch22
-rw-r--r--media-gfx/blender/files/blender-2.63a-eigen.patch555
-rw-r--r--media-gfx/blender/files/blender-2.63a-insecure.desktop17
-rw-r--r--media-gfx/blender/files/blender-desktop.patch20
-rw-r--r--media-gfx/blender/metadata.xml73
69 files changed, 0 insertions, 11502 deletions
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
deleted file mode 100644
index 846dc75..0000000
--- a/media-gfx/blender/Manifest
+++ /dev/null
@@ -1,73 +0,0 @@
-AUX blender-2.60-bmake.patch 3429 RMD160 585fe2729d0756fbb80d62b35da96d7c7d07b78d SHA1 7832d676e4625ec139bfc9fe113604f4c810a614 SHA256 3432df1f780503ad34a96c83d3faea9fabe2fa58f1bcdf6a52a2d7ae33874f16
-AUX blender-2.60-bullet.patch 7975 RMD160 3309d8ff9b5784963c85b0ec6fa5be29dab70015 SHA1 978d53a49fe76f107899432a4a88975cead1dddc SHA256 5b76da258eb6ce5533afa400838ee87819aece386911993de69a7864d0290467
-AUX blender-2.60-colamd.patch 8814 RMD160 e9b43b6a17c5328c5ca90cfec2bc2abcb53b2554 SHA1 eab44bd70212e4d029e0484b09cd7779e1ef751c SHA256 39432e50395c70f19f599cc35a35426fccc3b6675eec6a0696955e18d4f05f8d
-AUX blender-2.60-doxyfile.patch 595 RMD160 f4890f0ead6943f323bc61e7f6766c2133e8591b SHA1 0fd7c202f044224cf9944596cf36cfcd56b39067 SHA256 d267e0fab4ecb9be78b9238a9c2af60ac9d5ddb7b42f73f479b9266704605883
-AUX blender-2.60-eigen.patch 13804 RMD160 67b2d444f35ac5b9f2e2fc1ee93a105feadc83db SHA1 943ba7ebd2f37102b62d790d7ad4795695fba268 SHA256 b973b07db667ab84eebae24c47805772f6f2694bb77cb8846431d502c56b54d8
-AUX blender-2.60-glew.patch 1128 RMD160 392907190c8c970a1b2f0b20067d9f1bf108edbc SHA1 e9890bc4c420b16ce4f9c9c6cfc71c13852e4de3 SHA256 a43f0a0ac2a0cc5096e8488c926e7a32933a5910300440590a1cac5e1bb73f20
-AUX blender-2.60-libav-0.7.patch 1181 RMD160 66dc84d6ca37a97bb43886ed86b72499383636b6 SHA1 be60d7fd39821fb28b3e23a659df8f7eb51d1f60 SHA256 d8e7a08b042ce8311bd71e2edec7457ddf8fe8b64243f30f179d391ea170ab50
-AUX blender-2.60-linux-3.patch 414 RMD160 cb1cfc00e363e00c67a3c6d3567768418be78f39 SHA1 71f4701aa2e88de35843661cf5eecfe411ccd99b SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa5903fa325e4d4db21efd540d732
-AUX blender-2.60-openjpeg.patch 1731 RMD160 898318cfdc0c5daafd39d1f0f116531c6a2fd69f SHA1 5870c4f7b50f9edc4d12b68a684b8bb32548ad20 SHA256 3a684711e40ba365152593a6c90bbf38b190c84132e288c3dd3c7409dc6f9a62
-AUX blender-2.60a-CVE-2009-3850-v3.patch 7787 RMD160 02afc6ef3bcdf314c693c44be0cfc649ffd4ebf3 SHA1 031b42d09021b027dde631f08bc8e973299edab9 SHA256 1aebbdd475ccdb1d4e77c4c1ae4c3205e76a1a06f7dcd5e70624c141f42d204b
-AUX blender-2.60a-cmake.patch 1878 RMD160 c8e2c5f77fad86475b10b4634ba6efdf1f8f3ac4 SHA1 8e0c38ed3fe1bdfeb74ac6313d4aaae661fd742c SHA256 540602705f85971378fe86e28c2ac888a21085c49a6fe1cca762b30b922e77e8
-AUX blender-2.60a-desktop.patch 643 RMD160 43b8eaaef300fac4ebf463eb024356f65f76b7f5 SHA1 1b77d5a0c5ffe791117cfe140a7b3626bd3ba21b SHA256 8f2a7619d82a7ea64ade59aa067f2e6469129fe682b88f7c3ac6975650947ec1
-AUX blender-2.60a-enable_site_module.patch 974 RMD160 e93ddcd1372751951b6e56f72c764e2043747574 SHA1 84aed7ab30f5de1989ee63b4584db7acd6747b54 SHA256 dfafc00a08504c0c3259083d01e535e00f9a952db4a551dbacf0a62ad1a5c768
-AUX blender-2.60a-insecure.desktop 594 RMD160 48d7b683f4ae057a1766dabb267e5048e92114f6 SHA1 1d6d2c61a0c79b6c78842ad354746ffe5a2d7ffa SHA256 2b7920c517c93d4f1430dc7ee70a414d32c1b17648a0e8395bbd900d1be8dd84
-AUX blender-2.60a-libav-0.7.patch 1181 RMD160 66dc84d6ca37a97bb43886ed86b72499383636b6 SHA1 be60d7fd39821fb28b3e23a659df8f7eb51d1f60 SHA256 d8e7a08b042ce8311bd71e2edec7457ddf8fe8b64243f30f179d391ea170ab50
-AUX blender-2.60a-linux-3.patch 414 RMD160 cb1cfc00e363e00c67a3c6d3567768418be78f39 SHA1 71f4701aa2e88de35843661cf5eecfe411ccd99b SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa5903fa325e4d4db21efd540d732
-AUX blender-2.61-CVE-2009-3850-v3.patch 7515 RMD160 0faf4de3a330fd2920bdf2b688d3bc5cb530d86f SHA1 77c637a4e6be816534887dab06614bb3dddad3af SHA256 f9d2eb3e09d30c21a3f51de34bc978d25c598a2fc420e809ea49293c55178139
-AUX blender-2.61-CVE-2009-3850-v4.patch 9194 RMD160 cf5519882821c318f32ac3ff16f0a73998941228 SHA1 91e029b6bcdad6adec3034dc313604cae9f9d4dd SHA256 bcf6155d39ee3a31422ddfd21e729bce542a181ebdcfd9c4a6e40c37e06b9485
-AUX blender-2.61-collada.patch 1402 RMD160 89c91ad636614f06ab8b007c5064c06171943ebf SHA1 a2e444d6c25f07d07a9b77eee2a364015a57c28d SHA256 0b5d31b31e113053a998a8c16244b2d5801a8dac0f63fbd5905a51308981b4af
-AUX blender-2.61-desktop.patch 645 RMD160 ecba28ff2be0a72da11adf4f5b6a0dcdcb5af881 SHA1 d128fad9689e07758958915a74ba647b9a919bfd SHA256 e5936f45e1c0a1e0fa723609a66d8818c045cd56d3927ffbbd941d09cdbe4878
-AUX blender-2.61-eigen.patch 27106 RMD160 3042ba69913c98531ad60bd3a7fadf7817c5b062 SHA1 cde414399438b7d9ea7e756ef86aa08b5c9983e2 SHA256 e1e465f158a49287795d0f1a046d59b8d7ff8459c3ea8d57ee4b40518897d903
-AUX blender-2.61-enable_site_module.patch 1061 RMD160 60ba42b15c490776200fa0eea38ae7c856a1f567 SHA1 a9e5bf42d9b6ade5fb595009c6fde7412b002a8f SHA256 3d7b7c0814d97ed5db76828e243120782a0fb0a5304b90d978c3a20e1fb37a83
-AUX blender-2.61-glew.patch 1495 RMD160 86060b81c7649f9a47c44ce1f7393b5bc3becab1 SHA1 9612b2c580b640f8fd1509c70509b9816f05d176 SHA256 2c65e2bdf281672e2e25ca9d31afb66b3e34492dda7a5c613cd235ca78b0e45e
-AUX blender-2.61-insecure.desktop 596 RMD160 7fa4487d101479c5efcc83eddc23efe6dacfdb39 SHA1 28258b7bec5a07a025bb9b41a0ce63a11754b5a0 SHA256 65f98a4bdcaed85204bf83c26e65f16df05f5167b1703ae25b1e231c4845d91e
-AUX blender-2.61-opencollada-debug.patch 846 RMD160 55c37aea862c4318624fb394ca32f67775bc95b8 SHA1 5866b3e4911ba95b071457cf1fd09e5a87b63236 SHA256 c2861bca33a9a72dc5f45dfe15e5b552fe93843ee9d6e10e594baec62ecb206b
-AUX blender-2.62-CVE-2009-3850-v4.patch 9194 RMD160 cf5519882821c318f32ac3ff16f0a73998941228 SHA1 91e029b6bcdad6adec3034dc313604cae9f9d4dd SHA256 bcf6155d39ee3a31422ddfd21e729bce542a181ebdcfd9c4a6e40c37e06b9485
-AUX blender-2.62-colamd.patch 8741 RMD160 8eb93e079870b6f81258de1360b4d4e999ab7966 SHA1 2a1d55845cf100ff1c9858f4b54195ea18a06914 SHA256 ccd58de527b59f62195f2b9862f24cc9e790088a13ed428937aa3b2f76eb3a88
-AUX blender-2.62-collada.patch 1402 RMD160 89c91ad636614f06ab8b007c5064c06171943ebf SHA1 a2e444d6c25f07d07a9b77eee2a364015a57c28d SHA256 0b5d31b31e113053a998a8c16244b2d5801a8dac0f63fbd5905a51308981b4af
-AUX blender-2.62-desktop.patch 645 RMD160 a383502bc0fc8c2145955ef623e6e31aa07a16e8 SHA1 5453acb4d2a845d1fa1428c4eab6b460d44f5551 SHA256 1d50caf9b4e78731a49d4c94b705751b3161ce34886359afc790e42058a8a382
-AUX blender-2.62-doxyfile.patch 591 RMD160 f64970f00cbc123a5d5d6ce34a979b70060e5e7e SHA1 56c31bf42c60622d7d675ea8447f0c4fafb1fccf SHA256 f9ae6bb3fee939a66a191dbad319f9c958862ce6b4de2011a0b85bee431d491a
-AUX blender-2.62-eigen.patch 27619 RMD160 75de46a15f741b71de856b80a2397c94f8c8656a SHA1 778379ed1f9c7c0e25b344194f0603c56d35a617 SHA256 62c2701db4920ad064103d7190da214eaebf553b3c805a0f1afbf0310fb785b0
-AUX blender-2.62-enable_site_module.patch 1560 RMD160 bab416661e683545d8b66fb177fbd89353c0cf6f SHA1 22b82b86b221cb59f7811c182ad8d8fab77983a4 SHA256 670545321753d65038f5e37c7c3eb94a2ed20bc0d58f045ad3adc142125de9d8
-AUX blender-2.62-glew.patch 2039 RMD160 29a967d1cb167b26076e1e73fa7220d7d21364d3 SHA1 1fb29d1c3f0183aa272a928382e92a17548fbea2 SHA256 a96f6a9d12f2b6479883965589661f3435c1acf18205997d69ff2e29e7a8c98b
-AUX blender-2.62-insecure.desktop 596 RMD160 a986b8c2f3ab5fea15c3201c5733f848bc1b299c SHA1 d0a52d00c8912c253e5a066f397321e9f178be71 SHA256 b1dfac484638b86f1256eb7b04270ad6433c3a2bc7c20bf5bdd1a8ebed31aea2
-AUX blender-2.62-jp2.patch 393 RMD160 ebd2e45c8643628d7f50b20b195ca699da3f2bdb SHA1 e11148ba1da9814a3820a1507b5f871eea485bc0 SHA256 cd4c0d77577fdd47d14262fd0e46d47fa41f597c736df41f1738942b8a97c7a7
-AUX blender-2.62-opencollada-debug.patch 876 RMD160 38b989f11e7880a27c3eac3bf0d3eb5146dfa3e0 SHA1 836ddc2562b9eb4a0f48d467c4e0c008d120e0b3 SHA256 c781a1fc7f808c25fd0bc57524bc07ce36133dbfb2e2bdc27fa19b215597d905
-AUX blender-2.63-CVE-2009-3850-v5.patch 9062 RMD160 ca4aec257bae31766304673d6ebf81fddabcbf7a SHA1 e2b9c283100fd0117879a3b764a17a2c3e8d28a5 SHA256 8ce1e9d5b836df94bd7d4203db53434e33ac174533b6a7a06a2bc40ba75da633
-AUX blender-2.63-bullet.patch 8126 RMD160 d9159c5eddba1d3234226162a7ed86e4e96e9fd1 SHA1 ffd3ac08dc80d6208779f57a0bf26f14697f92be SHA256 b92ee405ffc9187296a2f88eb998ce669fec845cba3f57b3e18ce567ca0ceab9
-AUX blender-2.63-colamd.patch 8898 RMD160 36e6e4fdba0ab3b60d3ce39273056a369e328ba3 SHA1 f073734219ecc02f7820c8ccc42d2220e4cb3bec SHA256 b7e1ce3132cf00216e7063665d3140398d1b54451a2759e600cf9525202fe40f
-AUX blender-2.63-collada.patch 1402 RMD160 dc284668aa16ef45fa16444e76607cdd6f28972e SHA1 b9aced38ac79c5d05b4e8890dd7fd1d90a1c8c53 SHA256 0f8f6cea54e060cc0cff23a62394f6ef2a4fc84f6baa41b49e667176019f81dd
-AUX blender-2.63-desktop.patch 908 RMD160 7a4a4c2b80c4d0bb0466343fe3e1fb2f40c43af2 SHA1 0fd5625df48a464a709a2a801355a299f58e823a SHA256 0e2b1b97fadc4ec0aa110963af1efe9ec98148bbb295c14852d3aeafa582860e
-AUX blender-2.63-doxyfile.patch 797 RMD160 01e84c17d372a525cb5ac58bd27b0393267b64f3 SHA1 8d704d96f613d4ea97b37d5df0b05eb91b7f6e13 SHA256 9642445ac1531951a81f0314fa867597fc9dda82a20f638f3f07f8bc248daf23
-AUX blender-2.63-eigen.patch 27754 RMD160 51f1100deaf7f5ba3302ae0f53a700790c541bbb SHA1 8596e518d9e9ed1ac623583e35b8b35a265d9df0 SHA256 cbb4ff5ea30294238b2f0acd29c533998c736dab673405b17af16896e04b3b91
-AUX blender-2.63-enable_site_module.patch 1560 RMD160 493a3ed0e7cb7ae2ab4eaf2c51e066c20c743e37 SHA1 b82125e3348a530c2818b410b426424d9aa70e63 SHA256 805e3994a0ed3a96232e4d61beaf20bba9d2b2814f7f600a346f20e7f62c568a
-AUX blender-2.63-glew.patch 2057 RMD160 538630b168ad1a495886c18a44c5acc41961ff36 SHA1 45095fdf424c07924267b2571c296d016acc3111 SHA256 3265078bf60e417f0ef342f23415f56c106d75191660bd2a614e88856b8ee1b0
-AUX blender-2.63-insecure.desktop 727 RMD160 823c81c9771112f53212df7b9457d115931bddfc SHA1 72a0164f5f45836a232de6405b5278d91fb98150 SHA256 630e3cff84bedbe428bfd60b2890b0eabe1abf9eaa375d5dbd2701102412368a
-AUX blender-2.63-opencollada-debug.patch 876 RMD160 5c62aac0b551e60711f750eda409caa890974927 SHA1 4667676e1952fdf864cd18826c5fbd15522280fe SHA256 c91893010b20705718ee86592cc2bf798ea3b56e26852ccaca5ea97944539d68
-AUX blender-2.63a-bullet.patch 8068 RMD160 8ea1107bb609ca1eac48b3a479ec389f1dc91151 SHA1 4a5184fec26c9e496e8fcd567cde4e429e613af7 SHA256 d7485ed070e7fc904a34daa0ac9064034080a4c903142345ffa13b46faf243fb
-AUX blender-2.63a-colamd.patch 8808 RMD160 445409d5ea776d869c102f925cec5f3a3eda0191 SHA1 4e222bbfcc353b8f73d1ebbbdd63c981a5066cf1 SHA256 dd79fcdc7acb52b8197c8ab9ea0a677627ea679640ad9783debde7a284410cf2
-AUX blender-2.63a-collada.patch 1402 RMD160 dc284668aa16ef45fa16444e76607cdd6f28972e SHA1 b9aced38ac79c5d05b4e8890dd7fd1d90a1c8c53 SHA256 0f8f6cea54e060cc0cff23a62394f6ef2a4fc84f6baa41b49e667176019f81dd
-AUX blender-2.63a-desktop.patch 915 RMD160 0469c632159e8d3ce3fa889ffcb3b4f621e1b48f SHA1 24362ddb861cef25bec1d621927d1ee7e07210ae SHA256 70192be070b913b41551fe8d759bfe43844f9a51947df5a48f3d9a5c001742ea
-AUX blender-2.63a-eigen.patch 27682 RMD160 37ef622b2be0f8579dd0c1ab420423d7002fa375 SHA1 cfb4b584e88938ad6043639132348fa035b15d3d SHA256 62f5304990ef8743a1e0ee1f6663426cc19fc38ab4f0a14e20119221a67cf71d
-AUX blender-2.63a-insecure.desktop 730 RMD160 d93782a669091d057bb5d975b889c747a6e94447 SHA1 14cab40caea3a72b2cfdf9d51be5e9792480ff1c SHA256 6cef8bdf24782af99f682b5c244d693d6fa2952ca32408f51c7f2890323bc69a
-AUX blender-desktop.patch 641 RMD160 5be612d2836005e51e1bcfed10959e75315f201f SHA1 b0f99cdefc6c1a21b32ea97a237e214b22e5f9e6 SHA256 f52bc6f42eb07e693bfbe578747cf126b242b04273cbcd78a8ee4879eae8b514
-DIST blender-2.60a.tar.gz 25679123 RMD160 74434c4e748872322386971cf6021255b0bfa1c8 SHA1 f23551e6ed661626c61de4a758d9ff67e0f27529 SHA256 7d788599ab46dac37f630dec026d06f7e3d73508f243eeb4ade8bcdcb661f124
-DIST blender-2.61.tar.gz 25087312 RMD160 fb3b368144d31cd850a0602b7b5e746fca17d7fc SHA1 1b0d008e8022cb29efc9b4a337379eeb93bdcbb7 SHA256 58563583c8775fa0f746a7f4899b1619fec3df69accfa536544fdcbf372685f1
-DIST blender-2.62.tar.gz 26309220 RMD160 2a0067ac77659f507b141a0a25221d7410df9df7 SHA1 59d538d175695014fc0f8b6165127d5190378415 SHA256 7894db0072499af70f7cad1244bc1a701167fcbcf45d6ce1b8e41ad377c9aea7
-DIST blender-2.63.tar.gz 27361289 RMD160 25c4453ec966792c54e4cae43a86f521f0bc4658 SHA1 8d7359a86d716cc2198f776f28bac6625a45d6ad SHA256 ec70cc3fd5337012153fe07dbb415728cc5a48eba93c9888c660d0fbdc2294fc
-DIST blender-2.63a.tar.gz 26759658 RMD160 19e0f432c3ad7b506736031bed8914f81391f18d SHA1 b097dce9f3738917d43bf5fde8ef7c014223114c SHA256 c479b1abfe5fd8a1a5d04b8d21fdbc0fc960d7855b24785b888c09792bca4c1a
-EBUILD blender-2.60a.ebuild 13758 RMD160 895593489a8636353c446a3002cc102b4d1f420a SHA1 d0b295c1bc366afd2e1237e86dbe5a47a258483b SHA256 da0146ab46d7b9f3de0a46c001d347370a68c4eedd8a3c510355dbc1a1df99c6
-EBUILD blender-2.61-r1.ebuild 12980 RMD160 2ac5bd957691fdae4b8a0a13edbf7c2ee4391a06 SHA1 821ab1d27adf20050b32eac5f0da031fc98d5a46 SHA256 0dbe3d515df88e7b77fdad122c29218143efcd5ef8f11561111eea1b772ac5c6
-EBUILD blender-2.61-r2.ebuild 12241 RMD160 da6cb0d292e17067dadbdc57d1297752062fccf2 SHA1 d687477671d0aea49800216e8024a8e8b667359c SHA256 dc337df97f5ae539eaa7074d7706b574fd7b7e95461b5e970bfd3eb154a844c9
-EBUILD blender-2.61-r3.ebuild 13125 RMD160 3130b0f2b7ad378895c592916ea6d1e7484531cc SHA1 26f5841c7aeef2cf62f16d44dc877d8435014fc7 SHA256 9b785e2ccc238bafc88b9aed4cddf855096e359d2aeff7bd8f542e9b34fb7691
-EBUILD blender-2.61-r4.ebuild 13144 RMD160 2c7e9bb6ade408f4ab37a7ec9e683c05467fc475 SHA1 9bfb6e5ffb84071199c65c1e3a099326d97db812 SHA256 47435f466e3998019137f16bd329857a8024a2b98ce9dc3c86575ed227fa7c22
-EBUILD blender-2.61-r5.ebuild 13430 RMD160 9c60a1773e1320f16793b514eb6abd820c4f95c4 SHA1 1e2f8514a4062437b694b22b3b97d8214601ae55 SHA256 fe0802cec8a7b7558ce9b6be261db801db0daf5c29461a924aee003df2b4e6ce
-EBUILD blender-2.61.ebuild 13765 RMD160 e49b0272c5efe1a1eabe1b25133d2d790d6dfa50 SHA1 97b1bc11d15cd958ee59487dc51c77af42a523f3 SHA256 ed9ef4fb8097cade950f817662f81c4e610cc316cb0e5cbc2eb3d86a6bf44828
-EBUILD blender-2.62-r1.ebuild 13511 RMD160 84648b2cd3c095eea8ecaa9bdf267899891db23e SHA1 543fcd97355f464527de9c2692b9544502501f1a SHA256 1b293d4819b17a7ffe798e3db0b291fdaaaf90ba8b8453ca41c230a411cd8b89
-EBUILD blender-2.62-r2.ebuild 13563 RMD160 43e33473c2c1195a1f25c52a91f82b6b165d63bb SHA1 a188cb8bf81cf0be04e045d55d641f88f63b1a80 SHA256 226dfe9979f28b1a117df9d030a49f77c78ced59178e292fa7885170e0dce6da
-EBUILD blender-2.62.ebuild 13440 RMD160 c32ce8ec64c22b5a4d3baa6aa45b4169445b253c SHA1 bd04c4d4d7db0082146aca5c2355ed22ed822940 SHA256 d83d5cb2f4f45a968cb6127aaa5cf5c3a10add4037f94f230392569b6ebbf5a9
-EBUILD blender-2.63.ebuild 13495 RMD160 3e9f1c688b0c9295f1978c554f9779ed1372bf58 SHA1 5351e83c73c4cf75be8d377e79319c4a2a0ecb4a SHA256 550b3fe4cb38cb6e9177c8ced66daa2a938b73dc7737d0ab5707046666fd5b9f
-EBUILD blender-2.63a-r1.ebuild 13471 RMD160 9a699a53530d78cde278b814bc01f2c029b3a7d8 SHA1 7f25dbd4d70a5cbd33d3971236e52e605daae537 SHA256 5ac9e97e98ae22b0337953c4e2f980ef392ccdb9cbb9c47573befbc4bae9603d
-EBUILD blender-2.63a.ebuild 13485 RMD160 400243900e248802f4b821e003b9706628846eb0 SHA1 e6515ec30b7835f2102da8b1c8ebd07f139c6752 SHA256 76037c5301cba4031b239b4127ecfe3f5a404ea1c7330386bcf16c3f22210f2d
-MISC metadata.xml 2209 RMD160 d048e63cc31339dda18077862149d49ab86c0b4f SHA1 72ceed9bce06171b65f781229c4a7f917487546d SHA256 78301a69f89cec1ce7c5e8131f1675297af1126da10250297462b382ea14739a
diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild
deleted file mode 100644
index 6c55b20..0000000
--- a/media-gfx/blender/blender-2.60a.ebuild
+++ /dev/null
@@ -1,441 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
-
-IUSE="+game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
- +dds debug doc fftw jack apidoc sndfile lcms tweak-mode sdl sse \
- redcode +zlib iconv contrib verse 3dmouse"
-
-LANGS="en ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr sv uk zh_CN"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
- SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
- media-libs/libpng
- x11-libs/libXi
- x11-libs/libX11
- media-libs/tiff
- media-libs/libsamplerate
- virtual/opengl
- >=media-libs/freetype-2.0
- virtual/libintl
- media-libs/glew
- dev-cpp/eigen:2
- >=sci-physics/bullet-2.76
- iconv? ( virtual/libiconv )
- zlib? ( sys-libs/zlib )
- sdl? ( media-libs/libsdl[audio,joystick] )
- openexr? ( media-libs/openexr )
- ffmpeg? (
- >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
- )
- openal? ( >=media-libs/openal-1.6.372 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- sndfile? ( media-libs/libsndfile )
- lcms? ( media-libs/lcms )
- 3dmouse? ( dev-libs/libspnav )"
-
-DEPEND="dev-util/scons
- apidoc? (
- dev-python/sphinx
- app-doc/doxygen[-nodot]
- game-engine? ( dev-python/epydoc )
- )
- ${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
- DEPEND="${DEPEND}
- sys-devel/gettext"
-fi
-
-blend_with() {
- local UWORD="$2"
- [ -z "${UWORD}" ] && UWORD="$1"
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
- subversion_fetch
- if use contrib; then
- S="${S}"/release/scripts/addons_contrib subversion_fetch \
- "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
- fi
-else
- unpack ${A}
-fi
-}
-
-pkg_setup() {
- enable_openmp=0
- if use openmp; then
- if tc-has-openmp; then
- enable_openmp=1
- else
- ewarn "You are using gcc built without 'openmp' USE."
- ewarn "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
- fi
- python_set_active_version 3
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
- epatch "${FILESDIR}"/${PN}-${SLOT}-doxyfile.patch
-
- # TODO: write a proper Makefile to replace the borked bmake script
- epatch "${FILESDIR}"/${PN}-${SLOT}-bmake.patch
- chmod 755 "${WORKDIR}"/${P}/release/plugins/bmake
-
- # OpenJPEG
- einfo "Removing bundled OpenJPEG ..."
- rm -r extern/libopenjpeg
- epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
- # Glew
- einfo "Removing bundled Glew ..."
- rm -r extern/glew
- epatch "${FILESDIR}"/${PN}-${SLOT}-glew.patch
-
- # Eigen2
- einfo "Removing bundled Eigen2 ..."
- rm -r extern/Eigen2
- epatch "${FILESDIR}"/${PN}-${SLOT}-eigen.patch
-
- # Linux 3.x (bug #381099)
- epatch "${FILESDIR}"/${P}-linux-3.patch
-
- epatch "${FILESDIR}"/${P}-libav-0.7.patch
- epatch "${FILESDIR}"/${P}-CVE-2009-3850-v3.patch
- epatch "${FILESDIR}"/${P}-enable_site_module.patch
-}
-
-src_configure() {
- # add system openjpeg into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG="/usr"
- BF_OPENJPEG_INC="/usr/include"
- BF_OPENJPEG_LIB="openjpeg"
- EOF
-
- # FIX: littlecms includes path aren't specified
- if use lcms; then
- cat <<- EOF >> "${S}"/user-config.py
- BF_LCMS_INC="/usr/include/"
- BF_LCMS_LIB="lcms"
- BF_LCMS_LIBPATH="/usr/lib/"
- EOF
- fi
-
- # add system sci-physic/bullet into Scons build options.
-# cat <<- EOF >> "${S}"/user-config.py
-# WITH_BF_BULLET=1
-# BF_BULLET="/usr/include"
-# BF_BULLET_INC="/usr/include /usr/include/BulletCollision /usr/include/BulletDynamics /usr/include/LinearMath /usr/include/BulletSoftBody"
-# BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
-# EOF
-
- #add iconv into Scons build options.
- if use !elibc_glibc && use !elibc_uclibc && use iconv; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_ICONV=1
- BF_ICONV="/usr"
- EOF
- fi
-
- # configure internationalization only if LINGUAS have more
- # languages than 'en', otherwise must be disabled
- [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
- # configure Elbeem fluid system
- use elbeem || echo "BF_NO_ELBEEM=1" >> "${S}"/user-config.py
-
- # configure Tweak Mode
- use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
- # FIX: Game Engine module needs to be active to build the Blender Player
- if ! use game-engine && use player; then
- elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
- echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
- else
- blend_with game-engine gameengine
- fi
-
- # set CFLAGS used in /etc/make.conf correctly
- echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # set CXXFLAGS used in /etc/make.conf correctly
- local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset general options passed to the C/C++ compilers (useless hardcoded flags)
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
- # set LDFLAGS used in /etc/make.conf correctly
- local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset REL_* variables (useless hardcoded flags)
- cat <<- EOF >> "${S}"/user-config.py
- REL_CFLAGS=[]
- REL_CXXFLAGS=[]
- REL_CCFLAGS=[]
- EOF
-
- # reset warning flags (useless for NON blender developers)
- cat <<- EOF >> "${S}"/user-config.py
- C_WARN =[ '-w', '-g0' ]
- CC_WARN =[ '-w', '-g0' ]
- CXX_WARN=[ '-w', '-g0' ]
- EOF
-
- # detecting -j value from MAKEOPTS
- local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
- [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
- # generic settings which differ from the defaults from linux2-config.py
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
- BF_INSTALLDIR="../install"
- WITH_PYTHON_SECURITY=1
- WITHOUT_BF_PYTHON_INSTALL=1
- BF_PYTHON="/usr"
- BF_PYTHON_VERSION="3.2"
- BF_PYTHON_ABI_FLAGS=""
- BF_BUILDINFO=0
- BF_QUIET=1
- BF_NUMJOBS=${NUMJOBS}
- BF_LINE_OVERWRITE=0
- WITH_BF_FHS=1
- WITH_BF_BINRELOC=0
- WITH_BF_STATICOPENGL=0
- WITH_BF_OPENMP=${enable_openmp}
- EOF
-
- # configure WITH_BF* Scons build options
- for arg in \
- 'sdl' \
- 'apidoc docs' \
- 'lcms' \
- 'jack' \
- 'sndfile' \
- 'openexr' \
- 'dds' \
- 'fftw fftw3' \
- 'jpeg2k openjpeg' \
- 'openal'\
- 'ffmpeg' \
- 'ffmpeg ogg' \
- 'player' \
- 'sse rayoptimization' \
- 'redcode' \
- 'zlib' \
- 'verse' \
- '3dmouse' ; do
- blend_with ${arg}
- done
-
- # enable debugging/testing support
- use debug && echo "BF_DEBUG=1" >> "${S}"/user-config.py
- use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-
- einfo "Building plugins ..."
- # FIX: plugins are built without respecting user's LDFLAGS
- emake \
- CFLAGS="${CFLAGS} -fPIC" \
- LDFLAGS="$(raw-ldflags) -Bshareable" \
- -C release/plugins
-}
-
-src_install() {
- # creating binary wrapper
- cat <<- EOF >> "${WORKDIR}/install/blender-${SLOT}"
- #!/bin/sh
-
- # stop this script if the local blender path is a symlink
- if [ -L \${HOME}/.blender ]; then
- echo "Detected a symbolic link for \${HOME}/.blender"
- echo "Sorry, to avoid dangerous situations, the Blender binary can"
- echo "not be started until you have removed the symbolic link:"
- echo " # rm -i \${HOME}/.blender"
- exit 1
- fi
-
- export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${SLOT}/scripts"
- export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${SLOT}/datafiles"
- export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${SLOT}/plugins"
- exec /usr/bin/blender-bin-${SLOT} \$*
- EOF
-
- # install binaries
- exeinto /usr/bin/
- cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${SLOT}"
- doexe "${WORKDIR}/install/blender-bin-${SLOT}"
- doexe "${WORKDIR}/install/blender-${SLOT}"
- if use player; then
- cp "${WORKDIR}/install/blenderplayer" \
- "${WORKDIR}/install/blenderplayer-${SLOT}"
- doexe "${WORKDIR}/install/blenderplayer-${SLOT}"
- fi
-# if use verse; then
-# cp "${WORKDIR}"/install/bin/verse_server \
-# "${WORKDIR}/install/bin/verse_server-${SLOT}"
-# doexe "${WORKDIR}"/install/bin/verse_server-${SLOT}
-# fi
-
- # install plugins
- exeinto /usr/$(get_libdir)/${PN}/${SLOT}/plugins/texture
- doexe "${WORKDIR}"/${P}/release/plugins/texture/*.so
- exeinto /usr/$(get_libdir)/${PN}/${SLOT}/plugins/sequences
- doexe "${WORKDIR}"/${P}/release/plugins/sequence/*.so
- insinto /usr/include/${PN}/${SLOT}
- doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
-# rm -r "${WORKDIR}"/${P}/release/plugins
-# insinto /usr/share/${PN}/${SLOT}
-# doins "${WORKDIR}"/${P}/release/datafiles
-# doins "${WORKDIR}"/${P}/release/scripts
-
- # install desktop file
- insinto /usr/share/pixmaps
- cp release/freedesktop/icons/scalable/apps/blender.svg \
- release/freedesktop/icons/scalable/apps/blender-${SLOT}.svg
- doins release/freedesktop/icons/scalable/apps/blender-${SLOT}.svg
- insinto /usr/share/applications
- cp release/freedesktop/blender.desktop \
- release/freedesktop/blender-${SLOT}.desktop
- doins release/freedesktop/blender-${SLOT}.desktop
- newins "${FILESDIR}"/${P}-insecure.desktop ${PN}-${SLOT}-insecure.desktop
-
- # install docs
- doman "${WORKDIR}"/${P}/doc/manpage/blender.1
- use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
- if use apidoc; then
-
- einfo "Generating (BGE) Blender Game Engine API docs ..."
- epydoc source/gameengine/PyDoc/*.py -v \
- -o doc/BGE_API \
- --quiet --quiet --quiet \
- --simple-term \
- --url "http://www.blender.org" \
- --top API_intro \
- --name "Blender GameEngine" \
- --no-private --no-sourcecode \
- --inheritance=included \
- --graph=all \
- --dotpath /usr/bin/dot \
- || die "epydoc failed."
- docinto "API/gameengine"
- dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
- #einfo "Generating (BPY) Blender Python API docs ..."
- "${D}"/usr/bin/blender-bin-2.60 --background --python doc/python_api/sphinx_doc_gen.py || die "blender failed."
- pushd doc/python_api > /dev/null
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- popd > /dev/null
- docinto "API/python"
- dohtml -r doc/python_api/BPY_API/*
-
- einfo "Generating Blender C/C++ API docs ..."
- pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
- docinto "API/blender"
- dohtml -r html/*
- popd > /dev/null
- fi
-
- # final cleanup
- rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
-
- # installing blender
- insinto /usr/share/${PN}/${SLOT}
- doins -r "${WORKDIR}"/install/${SLOT}/*
-
- # FIX: making all python scripts readable only by group 'users',
- # so nobody can modify scripts apart root user, but python
- # cache (*.pyc) can be written and shared across the users.
-# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-#pkg_preinst() {
-# if [ -h "${ROOT}/usr/$(get_libdir)/blender/plugins/include" ];
-# then
-# rm -r "${ROOT}"/usr/$(get_libdir)/blender/plugins/include
-# fi
-#}
-
-pkg_postinst() {
- echo
- 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
- elog "Blender has its own internal rendering engine but you"
- elog "can export to external renderers for image computation"
- elog "like: YafRay[1], sunflow[2], PovRay[3] and luxrender[4]"
- elog
- elog "If you need one of them just emerge it:"
- elog " [1] emerge -av media-gfx/yafray"
- elog " [2] emerge -av media-gfx/sunflow"
- elog " [3] emerge -av media-gfx/povray"
- elog " [4] emerge -av media-gfx/luxrender"
- elog
- elog "When setting the Blender paths with the User Preferences"
- elog "dialog box, remember to NOT declare your home's paths as:"
- elog "~/.blender, but as: /home/user/.blender; in other words,"
- elog "DO NOT USE the tilde inside the paths, as Blender is not"
- elog "able to handle it, ignoring your customizations."
-}
diff --git a/media-gfx/blender/blender-2.61-r1.ebuild b/media-gfx/blender/blender-2.61-r1.ebuild
deleted file mode 100644
index c901280..0000000
--- a/media-gfx/blender/blender-2.61-r1.ebuild
+++ /dev/null
@@ -1,425 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
-
-IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
- +dds debug doc fftw jack apidoc sndfile tweak-mode sdl sse \
- redcode +zlib iconv contrib 3dmouse"
-
-LANGS="en ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr sv uk zh_CN"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
- SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
- media-libs/libpng
- x11-libs/libXi
- x11-libs/libX11
- media-libs/tiff
- media-libs/libsamplerate
- virtual/opengl
- >=media-libs/freetype-2.0
- virtual/libintl
- media-libs/glew
- >=sci-physics/bullet-2.76
- dev-cpp/eigen:3
- cycles? (
- media-libs/openimageio
- dev-libs/boost
- )
- iconv? ( virtual/libiconv )
- zlib? ( sys-libs/zlib )
- sdl? ( media-libs/libsdl[audio,joystick] )
- openexr? ( media-libs/openexr )
- ffmpeg? (
- >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
- )
- openal? ( >=media-libs/openal-1.6.372 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- sndfile? ( media-libs/libsndfile )
- 3dmouse? ( dev-libs/libspnav )"
-
-DEPEND="dev-util/scons
- apidoc? (
- dev-python/sphinx
- app-doc/doxygen[-nodot]
- game-engine? ( dev-python/epydoc )
- )
- ${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
- DEPEND="${DEPEND}
- sys-devel/gettext"
-fi
-
-blend_with() {
- local UWORD="$2"
- [ -z "${UWORD}" ] && UWORD="$1"
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
- subversion_fetch
- if use contrib; then
- S="${S}"/release/scripts/addons_contrib subversion_fetch \
- "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
- fi
-else
- unpack ${A}
-fi
-}
-
-pkg_setup() {
- enable_openmp=0
- if use openmp; then
- if tc-has-openmp; then
- enable_openmp=1
- else
- ewarn "You are using gcc built without 'openmp' USE."
- ewarn "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
- fi
- python_set_active_version 3
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
-
- # OpenJPEG
- einfo "Removing bundled OpenJPEG ..."
- rm -r extern/libopenjpeg
- epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
- # Glew
- einfo "Removing bundled Glew ..."
- rm -r extern/glew
- epatch "${FILESDIR}"/${P}-glew.patch
-
- # Eigen3
- einfo "Removing bundled Eigen3 ..."
- rm -r extern/Eigen3
- epatch "${FILESDIR}"/${P}-eigen.patch
-
- # Bullet2
- einfo "Removing bundled Bullet2 ..."
- rm -r extern/bullet2
- epatch "${FILESDIR}"/${PN}-${SLOT}-bullet.patch
-
- # Linux 3.x (bug #381099)
- epatch "${FILESDIR}"/${PN}-${SLOT}-linux-3.patch
-
- epatch "${FILESDIR}"/${PN}-${SLOT}-libav-0.7.patch
- epatch "${FILESDIR}"/${P}-CVE-2009-3850-v4.patch
- epatch "${FILESDIR}"/${P}-enable_site_module.patch
-}
-
-src_configure() {
- # add system openjpeg into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG="/usr"
- BF_OPENJPEG_INC="/usr/include"
- BF_OPENJPEG_LIB="openjpeg"
- EOF
-
- # add system sci-physic/bullet into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_BULLET=1
- BF_BULLET="/usr/include"
- BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
- BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
- EOF
-
- #add iconv into Scons build options.
- if use !elibc_glibc && use !elibc_uclibc && use iconv; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_ICONV=1
- BF_ICONV="/usr"
- EOF
- fi
-
- # configure internationalization only if LINGUAS have more
- # languages than 'en', otherwise must be disabled
- [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
- # configure Elbeem fluid system
- use elbeem || echo "BF_NO_ELBEEM=1" >> "${S}"/user-config.py
-
- # configure Tweak Mode
- use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
- # FIX: Game Engine module needs to be active to build the Blender Player
- if ! use game-engine && use player; then
- elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
- echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
- else
- blend_with game-engine gameengine
- fi
-
- # set CFLAGS used in /etc/make.conf correctly
- echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # set CXXFLAGS used in /etc/make.conf correctly
- local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset general options passed to the C/C++ compilers (useless hardcoded flags)
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
- # set LDFLAGS used in /etc/make.conf correctly
- local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset REL_* variables (useless hardcoded flags)
- cat <<- EOF >> "${S}"/user-config.py
- REL_CFLAGS=[]
- REL_CXXFLAGS=[]
- REL_CCFLAGS=[]
- EOF
-
- # reset warning flags (useless for NON blender developers)
- cat <<- EOF >> "${S}"/user-config.py
- C_WARN =[ '-w', '-g0' ]
- CC_WARN =[ '-w', '-g0' ]
- CXX_WARN=[ '-w', '-g0' ]
- EOF
-
- # detecting -j value from MAKEOPTS
- local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
- [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
- # generic settings which differ from the defaults from linux2-config.py
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
- BF_INSTALLDIR="../install"
- WITH_PYTHON_SECURITY=1
- WITHOUT_BF_PYTHON_INSTALL=1
- BF_PYTHON="/usr"
- BF_PYTHON_VERSION="3.2"
- BF_PYTHON_ABI_FLAGS=""
- BF_BUILDINFO=0
- BF_QUIET=1
- BF_NUMJOBS=${NUMJOBS}
- BF_LINE_OVERWRITE=0
- WITH_BF_FHS=1
- WITH_BF_BINRELOC=0
- WITH_BF_STATICOPENGL=0
- WITH_BF_OPENMP=${enable_openmp}
- EOF
-
- # configure WITH_BF* Scons build options
- for arg in \
- 'sdl' \
- 'apidoc docs' \
- 'jack' \
- 'sndfile' \
- 'openexr' \
- 'dds' \
- 'fftw fftw3' \
- 'jpeg2k openjpeg' \
- 'openal'\
- 'ffmpeg' \
- 'ffmpeg ogg' \
- 'player' \
- 'sse rayoptimization' \
- 'redcode' \
- 'zlib' \
- '3dmouse' ; do
- blend_with ${arg}
- done
-
- # enable debugging/testing support
- use debug && echo "BF_DEBUG=1" >> "${S}"/user-config.py
- use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-
- # enables Cycles render engine
- if use cycles; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_CYCLES=1
- WITH_BF_OIIO=1
- BF_OIIO="/usr"
- BF_OIIO_INC="/usr/include"
- BF_OIIO_LIB="OpenImageIO"
- WITH_BF_BOOST=1
- BF_BOOST="/usr"
- BF_BOOST_INC="/usr/include/boost"
- EOF
- fi
-
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-}
-
-src_install() {
- # creating binary wrapper
- cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
- #!/bin/sh
-
- # stop this script if the local blender path is a symlink
- if [ -L \${HOME}/.blender ]; then
- echo "Detected a symbolic link for \${HOME}/.blender"
- echo "Sorry, to avoid dangerous situations, the Blender binary can"
- echo "not be started until you have removed the symbolic link:"
- echo " # rm -i \${HOME}/.blender"
- exit 1
- fi
-
- export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts"
- export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles"
- export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV}/plugins"
- exec /usr/bin/blender-bin-${PV} \$*
- EOF
-
- # install binaries
- exeinto /usr/bin/
- cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-${PV}"
- if use player; then
- cp "${WORKDIR}/install/blenderplayer" \
- "${WORKDIR}/install/blenderplayer-${PV}"
- doexe "${WORKDIR}/install/blenderplayer-${PV}"
- fi
-
- # install plugin headers
- insinto /usr/include/${PN}/${PV}
- doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
-
- # install contrib scripts addons
- insinto /usr/share/${PN}/${PV}/scripts
- use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
-
- # install desktop file
- insinto /usr/share/pixmaps
- cp release/freedesktop/icons/scalable/apps/blender.svg \
- release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- insinto /usr/share/applications
- cp release/freedesktop/blender.desktop \
- release/freedesktop/blender-${PV}.desktop
- doins release/freedesktop/blender-${PV}.desktop
- newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
-
- # install docs
- doman "${WORKDIR}"/${P}/doc/manpage/blender.1
- use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
- if use apidoc; then
-
- einfo "Generating (BGE) Blender Game Engine API docs ..."
- epydoc source/gameengine/PyDoc/*.py -v \
- -o doc/BGE_API \
- --quiet --quiet --quiet \
- --simple-term \
- --url "http://www.blender.org" \
- --top API_intro \
- --name "Blender GameEngine" \
- --no-private --no-sourcecode \
- --inheritance=included \
- --graph=all \
- --dotpath /usr/bin/dot \
- || die "epydoc failed."
- docinto "API/gameengine"
- dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
- #einfo "Generating (BPY) Blender Python API docs ..."
- "${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py || die "blender failed."
- pushd doc/python_api > /dev/null
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- popd > /dev/null
- docinto "API/python"
- dohtml -r doc/python_api/BPY_API/*
-
- einfo "Generating Blender C/C++ API docs ..."
- pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
- docinto "API/blender"
- dohtml -r html/*
- popd > /dev/null
- fi
-
- # final cleanup
- rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
-
- # installing blender
- insinto /usr/share/${PN}/${PV}
- doins -r "${WORKDIR}"/install/${PV}/*
-
- # FIX: making all python scripts readable only by group 'users',
- # so nobody can modify scripts apart root user, but python
- # cache (*.pyc) can be written and shared across the users.
-# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-pkg_postinst() {
- echo
- 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
- elog "Blender has its own internal rendering engine but you"
- elog "can export to external renderers for image computation"
- elog "like: YafRay[1], sunflow[2], PovRay[3] and luxrender[4]"
- elog
- elog "If you need one of them just emerge it:"
- elog " [1] emerge -av media-gfx/yafray"
- elog " [2] emerge -av media-gfx/sunflow"
- elog " [3] emerge -av media-gfx/povray"
- elog " [4] emerge -av media-gfx/luxrender"
- elog
- elog "When setting the Blender paths with the User Preferences"
- elog "dialog box, remember to NOT declare your home's paths as:"
- elog "~/.blender, but as: /home/user/.blender; in other words,"
- elog "DO NOT USE the tilde inside the paths, as Blender is not"
- elog "able to handle it, ignoring your customizations."
-}
diff --git a/media-gfx/blender/blender-2.61-r2.ebuild b/media-gfx/blender/blender-2.61-r2.ebuild
deleted file mode 100644
index e71e14b..0000000
--- a/media-gfx/blender/blender-2.61-r2.ebuild
+++ /dev/null
@@ -1,410 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
-
-IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
- +dds debug doc fftw jack apidoc sndfile tweak-mode sdl sse \
- redcode +zlib iconv contrib 3dmouse"
-
-LANGS="en ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr sv uk zh_CN"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
- SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
- media-libs/libpng
- x11-libs/libXi
- x11-libs/libX11
- media-libs/tiff
- media-libs/libsamplerate
- virtual/opengl
- >=media-libs/freetype-2.0
- virtual/libintl
- media-libs/glew
- >=sci-physics/bullet-2.78
- dev-cpp/eigen:3
- cycles? (
- media-libs/openimageio
- dev-libs/boost
- )
- iconv? ( virtual/libiconv )
- zlib? ( sys-libs/zlib )
- sdl? ( media-libs/libsdl[audio,joystick] )
- openexr? ( media-libs/openexr )
- ffmpeg? (
- >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
- )
- openal? ( >=media-libs/openal-1.6.372 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- sndfile? ( media-libs/libsndfile )
- 3dmouse? ( dev-libs/libspnav )"
-
-DEPEND="dev-util/scons
- apidoc? (
- dev-python/sphinx
- app-doc/doxygen[-nodot]
- game-engine? ( dev-python/epydoc )
- )
- ${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
- DEPEND="${DEPEND}
- sys-devel/gettext"
-fi
-
-blend_with() {
- local UWORD="$2"
- [ -z "${UWORD}" ] && UWORD="$1"
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
- subversion_fetch
- if use contrib; then
- S="${S}"/release/scripts/addons_contrib subversion_fetch \
- "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
- fi
-else
- unpack ${A}
-fi
-}
-
-pkg_setup() {
- enable_openmp=0
- if use openmp; then
- if tc-has-openmp; then
- enable_openmp=1
- else
- ewarn "You are using gcc built without 'openmp' USE."
- ewarn "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
- fi
- python_set_active_version 3
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
-
- # OpenJPEG
- einfo "Removing bundled OpenJPEG ..."
- rm -r extern/libopenjpeg
- epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
- # Glew
- einfo "Removing bundled Glew ..."
- rm -r extern/glew
- epatch "${FILESDIR}"/${P}-glew.patch
-
- # Eigen3
- einfo "Removing bundled Eigen3 ..."
- rm -r extern/Eigen3
- epatch "${FILESDIR}"/${P}-eigen.patch
-
- # Bullet2
- einfo "Removing bundled Bullet2 ..."
- rm -r extern/bullet2
- epatch "${FILESDIR}"/${PN}-${SLOT}-bullet.patch
-
- # Linux 3.x (bug #381099)
- epatch "${FILESDIR}"/${PN}-${SLOT}-linux-3.patch
-
- epatch "${FILESDIR}"/${PN}-${SLOT}-libav-0.7.patch
- epatch "${FILESDIR}"/${P}-CVE-2009-3850-v4.patch
- epatch "${FILESDIR}"/${P}-enable_site_module.patch
-}
-
-src_configure() {
- # add system openjpeg into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG="/usr"
- BF_OPENJPEG_INC="/usr/include"
- BF_OPENJPEG_LIB="openjpeg"
- EOF
-
- # add system sci-physic/bullet into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_BULLET=1
- BF_BULLET="/usr/include"
- BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
- BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
- EOF
-
- #add iconv into Scons build options.
- if use !elibc_glibc && use !elibc_uclibc && use iconv; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_ICONV=1
- BF_ICONV="/usr"
- EOF
- fi
-
- # configure internationalization only if LINGUAS have more
- # languages than 'en', otherwise must be disabled
- [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
- # configure Elbeem fluid system
- use elbeem || echo "BF_NO_ELBEEM=1" >> "${S}"/user-config.py
-
- # configure Tweak Mode
- use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
- # FIX: Game Engine module needs to be active to build the Blender Player
- if ! use game-engine && use player; then
- elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
- echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
- else
- blend_with game-engine gameengine
- fi
-
- # set CFLAGS used in /etc/make.conf correctly
- echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # set CXXFLAGS used in /etc/make.conf correctly
- local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset general options passed to the C/C++ compilers (useless hardcoded flags)
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
- # set LDFLAGS used in /etc/make.conf correctly
- local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset REL_* variables (useless hardcoded flags)
- cat <<- EOF >> "${S}"/user-config.py
- REL_CFLAGS=[]
- REL_CXXFLAGS=[]
- REL_CCFLAGS=[]
- EOF
-
- # reset warning flags (useless for NON blender developers)
- cat <<- EOF >> "${S}"/user-config.py
- C_WARN =[ '-w', '-g0' ]
- CC_WARN =[ '-w', '-g0' ]
- CXX_WARN=[ '-w', '-g0' ]
- EOF
-
- # detecting -j value from MAKEOPTS
- local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
- [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
- # generic settings which differ from the defaults from linux2-config.py
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
- BF_INSTALLDIR="../install"
- WITH_PYTHON_SECURITY=1
- WITHOUT_BF_PYTHON_INSTALL=1
- BF_PYTHON="/usr"
- BF_PYTHON_VERSION="3.2"
- BF_PYTHON_ABI_FLAGS=""
- BF_BUILDINFO=0
- BF_QUIET=1
- BF_NUMJOBS=${NUMJOBS}
- BF_LINE_OVERWRITE=0
- WITH_BF_FHS=1
- WITH_BF_BINRELOC=0
- WITH_BF_STATICOPENGL=0
- WITH_BF_OPENMP=${enable_openmp}
- EOF
-
- # configure WITH_BF* Scons build options
- for arg in \
- 'sdl' \
- 'apidoc docs' \
- 'jack' \
- 'sndfile' \
- 'openexr' \
- 'dds' \
- 'fftw fftw3' \
- 'jpeg2k openjpeg' \
- 'openal'\
- 'ffmpeg' \
- 'ffmpeg ogg' \
- 'player' \
- 'sse rayoptimization' \
- 'redcode' \
- 'zlib' \
- '3dmouse' ; do
- blend_with ${arg}
- done
-
- # enable debugging/testing support
- use debug && echo "BF_DEBUG=1" >> "${S}"/user-config.py
- use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-
- # enables Cycles render engine
- if use cycles; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_CYCLES=1
- WITH_BF_OIIO=1
- BF_OIIO="/usr"
- BF_OIIO_INC="/usr/include"
- BF_OIIO_LIB="OpenImageIO"
- WITH_BF_BOOST=1
- BF_BOOST="/usr"
- BF_BOOST_INC="/usr/include/boost"
- EOF
- fi
-
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-}
-
-src_install() {
- # creating binary wrapper
- cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
- #!/bin/sh
-
- # stop this script if the local blender path is a symlink
- if [ -L \${HOME}/.blender ]; then
- echo "Detected a symbolic link for \${HOME}/.blender"
- echo "Sorry, to avoid dangerous situations, the Blender binary can"
- echo "not be started until you have removed the symbolic link:"
- echo " # rm -i \${HOME}/.blender"
- exit 1
- fi
-
- export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts"
- export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles"
- export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV}/plugins"
- exec /usr/bin/blender-bin-${PV} \$*
- EOF
-
- # install binaries
- exeinto /usr/bin/
- cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-${PV}"
- if use player; then
- cp "${WORKDIR}/install/blenderplayer" \
- "${WORKDIR}/install/blenderplayer-${PV}"
- doexe "${WORKDIR}/install/blenderplayer-${PV}"
- fi
-
- # install plugin headers
- insinto /usr/include/${PN}/${PV}
- doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
-
- # install contrib scripts addons
- insinto /usr/share/${PN}/${PV}/scripts
- use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
-
- # install desktop file
- insinto /usr/share/pixmaps
- cp release/freedesktop/icons/scalable/apps/blender.svg \
- release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- insinto /usr/share/applications
- cp release/freedesktop/blender.desktop \
- release/freedesktop/blender-${PV}.desktop
- doins release/freedesktop/blender-${PV}.desktop
- newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
-
- # install docs
- doman "${WORKDIR}"/${P}/doc/manpage/blender.1
- use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
- if use apidoc; then
-
- einfo "Generating (BGE) Blender Game Engine API docs ..."
- epydoc source/gameengine/PyDoc/*.py -v \
- -o doc/BGE_API \
- --quiet --quiet --quiet \
- --simple-term \
- --url "http://www.blender.org" \
- --top API_intro \
- --name "Blender GameEngine" \
- --no-private --no-sourcecode \
- --inheritance=included \
- --graph=all \
- --dotpath /usr/bin/dot \
- || die "epydoc failed."
- docinto "API/gameengine"
- dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
- #einfo "Generating (BPY) Blender Python API docs ..."
- "${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py || die "blender failed."
- pushd doc/python_api > /dev/null
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- popd > /dev/null
- docinto "API/python"
- dohtml -r doc/python_api/BPY_API/*
-
- einfo "Generating Blender C/C++ API docs ..."
- pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
- docinto "API/blender"
- dohtml -r html/*
- popd > /dev/null
- fi
-
- # final cleanup
- rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
-
- # installing blender
- insinto /usr/share/${PN}/${PV}
- doins -r "${WORKDIR}"/install/${PV}/*
-
- # FIX: making all python scripts readable only by group 'users',
- # so nobody can modify scripts apart root user, but python
- # cache (*.pyc) can be written and shared across the users.
-# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-pkg_postinst() {
- echo
- 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
-}
diff --git a/media-gfx/blender/blender-2.61-r3.ebuild b/media-gfx/blender/blender-2.61-r3.ebuild
deleted file mode 100644
index 22deef6..0000000
--- a/media-gfx/blender/blender-2.61-r3.ebuild
+++ /dev/null
@@ -1,437 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils ${SCM}
-
-IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
- +dds debug doc fftw jack apidoc sndfile tweak-mode sdl sse \
- redcode +zlib iconv contrib collada 3dmouse"
-
-LANGS="en ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr sv uk zh_CN"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
- SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
- media-libs/libpng
- x11-libs/libXi
- x11-libs/libX11
- media-libs/tiff
- media-libs/libsamplerate
- virtual/opengl
- >=media-libs/freetype-2.0
- virtual/libintl
- media-libs/glew
- >=sci-physics/bullet-2.78
- dev-cpp/eigen:3
- sci-libs/colamd
- cycles? (
- media-libs/openimageio
- dev-libs/boost
- )
- iconv? ( virtual/libiconv )
- zlib? ( sys-libs/zlib )
- sdl? ( media-libs/libsdl[audio,joystick] )
- openexr? ( media-libs/openexr )
- ffmpeg? (
- >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
- )
- openal? ( >=media-libs/openal-1.6.372 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- sndfile? ( media-libs/libsndfile )
- collada? ( media-libs/opencollada )
- 3dmouse? ( dev-libs/libspnav )"
-
-DEPEND="dev-util/scons
- apidoc? (
- dev-python/sphinx
- app-doc/doxygen[-nodot]
- game-engine? ( dev-python/epydoc )
- )
- ${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
- DEPEND="${DEPEND}
- sys-devel/gettext"
-fi
-
-blend_with() {
- local UWORD="$2"
- [ -z "${UWORD}" ] && UWORD="$1"
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
- subversion_fetch
- if use contrib; then
- S="${S}"/release/scripts/addons_contrib subversion_fetch \
- "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
- fi
-else
- unpack ${A}
-fi
-}
-
-pkg_setup() {
- enable_openmp=0
- if use openmp; then
- if tc-has-openmp; then
- enable_openmp=1
- else
- ewarn "You are using gcc built without 'openmp' USE."
- ewarn "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
- fi
- python_set_active_version 3
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
- epatch "${FILESDIR}"/${P}-collada.patch
-
- # OpenJPEG
- einfo "Removing bundled OpenJPEG ..."
- rm -r extern/libopenjpeg
- epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
- # Glew
- einfo "Removing bundled Glew ..."
- rm -r extern/glew
- epatch "${FILESDIR}"/${P}-glew.patch
-
- # Eigen3
- einfo "Removing bundled Eigen3 ..."
- rm -r extern/Eigen3
- epatch "${FILESDIR}"/${P}-eigen.patch
-
- # Bullet2
- einfo "Removing bundled Bullet2 ..."
- rm -r extern/bullet2
- epatch "${FILESDIR}"/${PN}-${SLOT}-bullet.patch
-
- # Colamd
- einfo "Removing bundled Colamd ..."
- rm -r extern/colamd
- epatch "${FILESDIR}"/${PN}-${SLOT}-colamd.patch
-
- ewarn "$(echo "Remaining bundled dependencies:";
- find extern -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
-
- # Linux 3.x (bug #381099)
- epatch "${FILESDIR}"/${PN}-${SLOT}-linux-3.patch
-
- epatch "${FILESDIR}"/${PN}-${SLOT}-libav-0.7.patch
- epatch "${FILESDIR}"/${P}-CVE-2009-3850-v4.patch
- epatch "${FILESDIR}"/${P}-enable_site_module.patch
-}
-
-src_configure() {
- # add system openjpeg into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG="/usr"
- BF_OPENJPEG_INC="/usr/include"
- BF_OPENJPEG_LIB="openjpeg"
- EOF
-
- # add system sci-physic/bullet into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_BULLET=1
- BF_BULLET="/usr/include"
- BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
- BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
- EOF
-
- # add system sci-libs/colamd into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_COLAMD=1
- BF_COLAMD="/usr"
- BF_COLAMD_INC="/usr/include"
- BF_COLAMD_LIB="colamd"
- EOF
-
- #add iconv into Scons build options.
- if use !elibc_glibc && use !elibc_uclibc && use iconv; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_ICONV=1
- BF_ICONV="/usr"
- EOF
- fi
-
- # configure internationalization only if LINGUAS have more
- # languages than 'en', otherwise must be disabled
- [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
- # configure Elbeem fluid system
- use elbeem || echo "BF_NO_ELBEEM=1" >> "${S}"/user-config.py
-
- # configure Tweak Mode
- use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
- # FIX: Game Engine module needs to be active to build the Blender Player
- if ! use game-engine && use player; then
- elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
- echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
- else
- blend_with game-engine gameengine
- fi
-
- # set CFLAGS used in /etc/make.conf correctly
- echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # set CXXFLAGS used in /etc/make.conf correctly
- local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset general options passed to the C/C++ compilers (useless hardcoded flags)
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
- # set LDFLAGS used in /etc/make.conf correctly
- local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset REL_* variables (useless hardcoded flags)
- cat <<- EOF >> "${S}"/user-config.py
- REL_CFLAGS=[]
- REL_CXXFLAGS=[]
- REL_CCFLAGS=[]
- EOF
-
- # reset warning flags (useless for NON blender developers)
- cat <<- EOF >> "${S}"/user-config.py
- C_WARN =[ '-w', '-g0' ]
- CC_WARN =[ '-w', '-g0' ]
- CXX_WARN=[ '-w', '-g0' ]
- EOF
-
- # detecting -j value from MAKEOPTS
- local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
- [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
- # generic settings which differ from the defaults from linux2-config.py
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
- BF_INSTALLDIR="../install"
- WITH_PYTHON_SECURITY=1
- WITHOUT_BF_PYTHON_INSTALL=1
- BF_PYTHON="/usr"
- BF_PYTHON_VERSION="3.2"
- BF_PYTHON_ABI_FLAGS=""
- BF_BUILDINFO=0
- BF_QUIET=1
- BF_NUMJOBS=${NUMJOBS}
- BF_LINE_OVERWRITE=0
- WITH_BF_FHS=1
- WITH_BF_BINRELOC=0
- WITH_BF_STATICOPENGL=0
- WITH_BF_OPENMP=${enable_openmp}
- EOF
-
- # configure WITH_BF* Scons build options
- for arg in \
- 'sdl' \
- 'apidoc docs' \
- 'jack' \
- 'sndfile' \
- 'openexr' \
- 'dds' \
- 'fftw fftw3' \
- 'jpeg2k openjpeg' \
- 'openal'\
- 'ffmpeg' \
- 'ffmpeg ogg' \
- 'player' \
- 'sse rayoptimization' \
- 'redcode' \
- 'zlib' \
- 'collada' \
- '3dmouse' ; do
- blend_with ${arg}
- done
-
- # add system media-libs/opencollada into Scons build options.
- echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
- echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
-
- # enable debugging/testing support
- use debug && echo "BF_DEBUG=1" >> "${S}"/user-config.py
- use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-
- # enables Cycles render engine
- if use cycles; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_CYCLES=1
- WITH_BF_OIIO=1
- BF_OIIO="/usr"
- BF_OIIO_INC="/usr/include"
- BF_OIIO_LIB="OpenImageIO"
- WITH_BF_BOOST=1
- BF_BOOST="/usr"
- BF_BOOST_INC="/usr/include/boost"
- EOF
- fi
-
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-}
-
-src_install() {
- # creating binary wrapper
- cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
- #!/bin/sh
-
- # stop this script if the local blender path is a symlink
- if [ -L \${HOME}/.blender ]; then
- echo "Detected a symbolic link for \${HOME}/.blender"
- echo "Sorry, to avoid dangerous situations, the Blender binary can"
- echo "not be started until you have removed the symbolic link:"
- echo " # rm -i \${HOME}/.blender"
- exit 1
- fi
-
- export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts"
- export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles"
- export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV}/plugins"
- exec /usr/bin/blender-bin-${PV} \$*
- EOF
-
- # Pax mark blender for hardened support.
- pax-mark m "${WORKDIR}/install/blender"
-
- # install binaries
- exeinto /usr/bin/
- cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-${PV}"
- if use player; then
- cp "${WORKDIR}/install/blenderplayer" \
- "${WORKDIR}/install/blenderplayer-${PV}"
- doexe "${WORKDIR}/install/blenderplayer-${PV}"
- fi
-
- # install plugin headers
- insinto /usr/include/${PN}/${PV}
- doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
-
- # install contrib scripts addons
- insinto /usr/share/${PN}/${PV}/scripts
- use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
-
- # install desktop file
- insinto /usr/share/pixmaps
- cp release/freedesktop/icons/scalable/apps/blender.svg \
- release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- insinto /usr/share/applications
- cp release/freedesktop/blender.desktop \
- release/freedesktop/blender-${PV}.desktop
- doins release/freedesktop/blender-${PV}.desktop
- newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
-
- # install docs
- doman "${WORKDIR}"/${P}/doc/manpage/blender.1
- use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
- if use apidoc; then
-
- einfo "Generating (BGE) Blender Game Engine API docs ..."
- epydoc source/gameengine/PyDoc/*.py -v \
- -o doc/BGE_API \
- --quiet --quiet --quiet \
- --simple-term \
- --url "http://www.blender.org" \
- --top API_intro \
- --name "Blender GameEngine" \
- --no-private --no-sourcecode \
- --inheritance=included \
- --graph=all \
- --dotpath /usr/bin/dot \
- || die "epydoc failed."
- docinto "API/gameengine"
- dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
- #einfo "Generating (BPY) Blender Python API docs ..."
- "${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py || die "blender failed."
- pushd doc/python_api > /dev/null
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- popd > /dev/null
- docinto "API/python"
- dohtml -r doc/python_api/BPY_API/*
-
- einfo "Generating Blender C/C++ API docs ..."
- pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
- docinto "API/blender"
- dohtml -r html/*
- popd > /dev/null
- fi
-
- # final cleanup
- rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
-
- # installing blender
- insinto /usr/share/${PN}/${PV}
- doins -r "${WORKDIR}"/install/${PV}/*
-
- # FIX: making all python scripts readable only by group 'users',
- # so nobody can modify scripts apart root user, but python
- # cache (*.pyc) can be written and shared across the users.
-# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-pkg_postinst() {
- echo
- 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
-}
diff --git a/media-gfx/blender/blender-2.61-r4.ebuild b/media-gfx/blender/blender-2.61-r4.ebuild
deleted file mode 100644
index 985e0de..0000000
--- a/media-gfx/blender/blender-2.61-r4.ebuild
+++ /dev/null
@@ -1,438 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils ${SCM}
-
-IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
- +dds debug doc fftw jack apidoc sndfile tweak-mode sdl sse \
- redcode +zlib iconv contrib collada 3dmouse"
-
-LANGS="en ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr sv uk zh_CN"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
- SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
- media-libs/libpng
- x11-libs/libXi
- x11-libs/libX11
- media-libs/tiff
- media-libs/libsamplerate
- virtual/opengl
- >=media-libs/freetype-2.0
- virtual/libintl
- media-libs/glew
- >=sci-physics/bullet-2.78
- dev-cpp/eigen:3
- sci-libs/colamd
- cycles? (
- media-libs/openimageio
- dev-libs/boost
- )
- iconv? ( virtual/libiconv )
- zlib? ( sys-libs/zlib )
- sdl? ( media-libs/libsdl[audio,joystick] )
- openexr? ( media-libs/openexr )
- ffmpeg? (
- >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
- )
- openal? ( >=media-libs/openal-1.6.372 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- sndfile? ( media-libs/libsndfile )
- collada? ( media-libs/opencollada )
- 3dmouse? ( dev-libs/libspnav )"
-
-DEPEND="dev-util/scons
- apidoc? (
- dev-python/sphinx
- app-doc/doxygen[-nodot]
- game-engine? ( dev-python/epydoc )
- )
- ${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
- DEPEND="${DEPEND}
- sys-devel/gettext"
-fi
-
-blend_with() {
- local UWORD="$2"
- [ -z "${UWORD}" ] && UWORD="$1"
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
- subversion_fetch
- if use contrib; then
- S="${S}"/release/scripts/addons_contrib subversion_fetch \
- "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
- fi
-else
- unpack ${A}
-fi
-}
-
-pkg_setup() {
- enable_openmp=0
- if use openmp; then
- if tc-has-openmp; then
- enable_openmp=1
- else
- ewarn "You are using gcc built without 'openmp' USE."
- ewarn "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
- fi
- python_set_active_version 3
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
- epatch "${FILESDIR}"/${P}-collada.patch
-
- # OpenJPEG
- einfo "Removing bundled OpenJPEG ..."
- rm -r extern/libopenjpeg
- epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
- # Glew
- einfo "Removing bundled Glew ..."
- rm -r extern/glew
- epatch "${FILESDIR}"/${P}-glew.patch
-
- # Eigen3
- einfo "Removing bundled Eigen3 ..."
- rm -r extern/Eigen3
- epatch "${FILESDIR}"/${P}-eigen.patch
-
- # Bullet2
- einfo "Removing bundled Bullet2 ..."
- rm -r extern/bullet2
- epatch "${FILESDIR}"/${PN}-${SLOT}-bullet.patch
-
- # Colamd
- einfo "Removing bundled Colamd ..."
- rm -r extern/colamd
- epatch "${FILESDIR}"/${PN}-${SLOT}-colamd.patch
-
- ewarn "$(echo "Remaining bundled dependencies:";
- find extern -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
-
- # Linux 3.x (bug #381099)
- epatch "${FILESDIR}"/${PN}-${SLOT}-linux-3.patch
-
- epatch "${FILESDIR}"/${PN}-${SLOT}-libav-0.7.patch
- epatch "${FILESDIR}"/${P}-CVE-2009-3850-v4.patch
- epatch "${FILESDIR}"/${P}-enable_site_module.patch
-}
-
-src_configure() {
- # add system openjpeg into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG="/usr"
- BF_OPENJPEG_INC="/usr/include"
- BF_OPENJPEG_LIB="openjpeg"
- EOF
-
- # add system sci-physic/bullet into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_BULLET=1
- BF_BULLET="/usr/include"
- BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
- BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
- EOF
-
- # add system sci-libs/colamd into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_COLAMD=1
- BF_COLAMD="/usr"
- BF_COLAMD_INC="/usr/include"
- BF_COLAMD_LIB="colamd"
- EOF
-
- #add iconv into Scons build options.
- if use !elibc_glibc && use !elibc_uclibc && use iconv; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_ICONV=1
- BF_ICONV="/usr"
- EOF
- fi
-
- # configure internationalization only if LINGUAS have more
- # languages than 'en', otherwise must be disabled
- [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
- # Ocean sim system needs fftw
- use fftw || echo "WITH_BF_OCEANSIM=0" >> "${S}"/user-config.py
-
- # configure Tweak Mode
- use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
- # FIX: Game Engine module needs to be active to build the Blender Player
- if ! use game-engine && use player; then
- elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
- echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
- else
- blend_with game-engine gameengine
- fi
-
- # set CFLAGS used in /etc/make.conf correctly
- echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # set CXXFLAGS used in /etc/make.conf correctly
- local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset general options passed to the C/C++ compilers (useless hardcoded flags)
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
- # set LDFLAGS used in /etc/make.conf correctly
- local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset REL_* variables (useless hardcoded flags)
- cat <<- EOF >> "${S}"/user-config.py
- REL_CFLAGS=[]
- REL_CXXFLAGS=[]
- REL_CCFLAGS=[]
- EOF
-
- # reset warning flags (useless for NON blender developers)
- cat <<- EOF >> "${S}"/user-config.py
- C_WARN =[ '-w', '-g0' ]
- CC_WARN =[ '-w', '-g0' ]
- CXX_WARN=[ '-w', '-g0' ]
- EOF
-
- # detecting -j value from MAKEOPTS
- local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
- [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
- # generic settings which differ from the defaults from linux2-config.py
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
- BF_INSTALLDIR="../install"
- WITH_PYTHON_SECURITY=1
- WITHOUT_BF_PYTHON_INSTALL=1
- BF_PYTHON="/usr"
- BF_PYTHON_VERSION="3.2"
- BF_PYTHON_ABI_FLAGS=""
- BF_BUILDINFO=0
- BF_QUIET=1
- BF_NUMJOBS=${NUMJOBS}
- BF_LINE_OVERWRITE=0
- WITH_BF_FHS=1
- WITH_BF_BINRELOC=0
- WITH_BF_STATICOPENGL=0
- WITH_BF_OPENMP=${enable_openmp}
- EOF
-
- # configure WITH_BF* Scons build options
- for arg in \
- 'elbeem fluid' \
- 'sdl' \
- 'apidoc docs' \
- 'jack' \
- 'sndfile' \
- 'openexr' \
- 'dds' \
- 'fftw fftw3' \
- 'jpeg2k openjpeg' \
- 'openal'\
- 'ffmpeg' \
- 'ffmpeg ogg' \
- 'player' \
- 'sse rayoptimization' \
- 'redcode' \
- 'zlib' \
- 'collada' \
- '3dmouse' ; do
- blend_with ${arg}
- done
-
- # add system media-libs/opencollada into Scons build options.
- echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
- echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
-
- # enable debugging/testing support
- use debug && echo "BF_DEBUG=1" >> "${S}"/user-config.py
- use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-
- # enables Cycles render engine
- if use cycles; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_CYCLES=1
- WITH_BF_OIIO=1
- BF_OIIO="/usr"
- BF_OIIO_INC="/usr/include"
- BF_OIIO_LIB="OpenImageIO"
- WITH_BF_BOOST=1
- BF_BOOST="/usr"
- BF_BOOST_INC="/usr/include/boost"
- EOF
- fi
-
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-}
-
-src_install() {
- # creating binary wrapper
- cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
- #!/bin/sh
-
- # stop this script if the local blender path is a symlink
- if [ -L \${HOME}/.blender ]; then
- echo "Detected a symbolic link for \${HOME}/.blender"
- echo "Sorry, to avoid dangerous situations, the Blender binary can"
- echo "not be started until you have removed the symbolic link:"
- echo " # rm -i \${HOME}/.blender"
- exit 1
- fi
-
- export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts"
- export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles"
- export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV}/plugins"
- exec /usr/bin/blender-bin-${PV} \$*
- EOF
-
- # Pax mark blender for hardened support.
- pax-mark m "${WORKDIR}/install/blender"
-
- # install binaries
- exeinto /usr/bin/
- cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-${PV}"
- if use player; then
- cp "${WORKDIR}/install/blenderplayer" \
- "${WORKDIR}/install/blenderplayer-${PV}"
- doexe "${WORKDIR}/install/blenderplayer-${PV}"
- fi
-
- # install plugin headers
- insinto /usr/include/${PN}/${PV}
- doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
-
- # install contrib scripts addons
- insinto /usr/share/${PN}/${PV}/scripts
- use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
-
- # install desktop file
- insinto /usr/share/pixmaps
- cp release/freedesktop/icons/scalable/apps/blender.svg \
- release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- insinto /usr/share/applications
- cp release/freedesktop/blender.desktop \
- release/freedesktop/blender-${PV}.desktop
- doins release/freedesktop/blender-${PV}.desktop
- newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
-
- # install docs
- doman "${WORKDIR}"/${P}/doc/manpage/blender.1
- use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
- if use apidoc; then
-
- einfo "Generating (BGE) Blender Game Engine API docs ..."
- epydoc source/gameengine/PyDoc/*.py -v \
- -o doc/BGE_API \
- --quiet --quiet --quiet \
- --simple-term \
- --url "http://www.blender.org" \
- --top API_intro \
- --name "Blender GameEngine" \
- --no-private --no-sourcecode \
- --inheritance=included \
- --graph=all \
- --dotpath /usr/bin/dot \
- || die "epydoc failed."
- docinto "API/gameengine"
- dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
- #einfo "Generating (BPY) Blender Python API docs ..."
- "${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py || die "blender failed."
- pushd doc/python_api > /dev/null
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- popd > /dev/null
- docinto "API/python"
- dohtml -r doc/python_api/BPY_API/*
-
- einfo "Generating Blender C/C++ API docs ..."
- pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
- docinto "API/blender"
- dohtml -r html/*
- popd > /dev/null
- fi
-
- # final cleanup
- rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
-
- # installing blender
- insinto /usr/share/${PN}/${PV}
- doins -r "${WORKDIR}"/install/${PV}/*
-
- # FIX: making all python scripts readable only by group 'users',
- # so nobody can modify scripts apart root user, but python
- # cache (*.pyc) can be written and shared across the users.
-# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-pkg_postinst() {
- echo
- 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
-}
diff --git a/media-gfx/blender/blender-2.61-r5.ebuild b/media-gfx/blender/blender-2.61-r5.ebuild
deleted file mode 100644
index a0d7858..0000000
--- a/media-gfx/blender/blender-2.61-r5.ebuild
+++ /dev/null
@@ -1,446 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils ${SCM}
-
-IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
- +dds doc fftw jack apidoc sndfile tweak-mode sdl sse \
- redcode iconv contrib collada 3dmouse"
-
-LANGS="en ar bg ca cs de el es es_ES es_MX fa fi fr id it ja ne pl pt_BR ru sr sv uk zh_CN zh_TW"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
- SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
- media-libs/libpng:0
- x11-libs/libXi
- x11-libs/libX11
- media-libs/tiff:0
- media-libs/libsamplerate
- virtual/opengl
- >=media-libs/freetype-2.0
- virtual/libintl
- media-libs/glew
- >=sci-physics/bullet-2.78
- dev-cpp/eigen:3
- sci-libs/colamd
- sys-libs/zlib
- cycles? (
- media-libs/openimageio
- dev-libs/boost
- )
- iconv? ( virtual/libiconv )
- sdl? ( media-libs/libsdl[audio,joystick] )
- openexr? ( media-libs/openexr )
- ffmpeg? (
- >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
- )
- openal? ( >=media-libs/openal-1.6.372 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- sndfile? ( media-libs/libsndfile )
- collada? ( media-libs/opencollada )
- 3dmouse? ( dev-libs/libspnav )"
-
-DEPEND="dev-util/scons
- apidoc? (
- dev-python/sphinx
- app-doc/doxygen[-nodot]
- game-engine? ( dev-python/epydoc )
- )
- ${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
- DEPEND="${DEPEND}
- sys-devel/gettext"
-fi
-
-blend_with() {
- local UWORD="$2"
- [ -z "${UWORD}" ] && UWORD="$1"
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
- subversion_fetch
- if use contrib; then
- S="${S}"/release/scripts/addons_contrib subversion_fetch \
- "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
- fi
-else
- unpack ${A}
-fi
-}
-
-pkg_setup() {
- enable_openmp=0
- if use openmp; then
- if tc-has-openmp; then
- enable_openmp=1
- else
- ewarn "You are using gcc built without 'openmp' USE."
- ewarn "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
- fi
- python_set_active_version 3
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
- epatch "${FILESDIR}"/${P}-collada.patch
-
- # OpenJPEG
- einfo "Removing bundled OpenJPEG ..."
- rm -r extern/libopenjpeg
- epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
- # Glew
- einfo "Removing bundled Glew ..."
- rm -r extern/glew
- epatch "${FILESDIR}"/${P}-glew.patch
-
- # Eigen3
- einfo "Removing bundled Eigen3 ..."
- rm -r extern/Eigen3
- epatch "${FILESDIR}"/${P}-eigen.patch
-
- # Bullet2
- einfo "Removing bundled Bullet2 ..."
- rm -r extern/bullet2
- epatch "${FILESDIR}"/${PN}-${SLOT}-bullet.patch
-
- # Colamd
- einfo "Removing bundled Colamd ..."
- rm -r extern/colamd
- epatch "${FILESDIR}"/${PN}-${SLOT}-colamd.patch
-
- ewarn "$(echo "Remaining bundled dependencies:";
- find extern -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
-
- # Linux 3.x (bug #381099)
- epatch "${FILESDIR}"/${PN}-${SLOT}-linux-3.patch
-
- epatch "${FILESDIR}"/${PN}-${SLOT}-libav-0.7.patch
- epatch "${FILESDIR}"/${P}-CVE-2009-3850-v4.patch
- epatch "${FILESDIR}"/${P}-enable_site_module.patch
- epatch "${FILESDIR}"/${P}-opencollada-debug.patch
-}
-
-src_configure() {
- # add system openjpeg into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG="/usr"
- BF_OPENJPEG_INC="/usr/include"
- BF_OPENJPEG_LIB="openjpeg"
- EOF
-
- # add system sci-physic/bullet into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_BULLET=1
- BF_BULLET="/usr/include"
- BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
- BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
- EOF
-
- # add system sci-libs/colamd into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_COLAMD=1
- BF_COLAMD="/usr"
- BF_COLAMD_INC="/usr/include"
- BF_COLAMD_LIB="colamd"
- EOF
-
- #add iconv into Scons build options.
- if use !elibc_glibc && use !elibc_uclibc && use iconv; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_ICONV=1
- BF_ICONV="/usr"
- EOF
- fi
-
- # configure internationalization only if LINGUAS have more
- # languages than 'en', otherwise must be disabled
- [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
- # Ocean sim system needs fftw
- use fftw || echo "WITH_BF_OCEANSIM=0" >> "${S}"/user-config.py
-
- # configure Tweak Mode
- use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
- # FIX: Game Engine module needs to be active to build the Blender Player
- if ! use game-engine && use player; then
- elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
- echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
- else
- blend_with game-engine gameengine
- fi
-
- # set CFLAGS used in /etc/make.conf correctly
- echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # set CXXFLAGS used in /etc/make.conf correctly
- local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset general options passed to the C/C++ compilers (useless hardcoded flags)
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
- # set LDFLAGS used in /etc/make.conf correctly
- local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset REL_* variables (useless hardcoded flags)
- cat <<- EOF >> "${S}"/user-config.py
- REL_CFLAGS=[]
- REL_CXXFLAGS=[]
- REL_CCFLAGS=[]
- EOF
-
- # reset warning flags (useless for NON blender developers)
- cat <<- EOF >> "${S}"/user-config.py
- C_WARN =[ '-w', '-g0' ]
- CC_WARN =[ '-w', '-g0' ]
- CXX_WARN=[ '-w', '-g0' ]
- EOF
-
- # detecting -j value from MAKEOPTS
- local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
- [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
- # generic settings which differ from the defaults from linux2-config.py
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
- BF_INSTALLDIR="../install"
- WITH_PYTHON_SECURITY=1
- WITHOUT_BF_PYTHON_INSTALL=1
- BF_PYTHON="/usr"
- BF_PYTHON_VERSION="3.2"
- BF_PYTHON_ABI_FLAGS=""
- BF_BUILDINFO=0
- BF_QUIET=1
- BF_NUMJOBS=${NUMJOBS}
- BF_LINE_OVERWRITE=0
- WITH_BF_FHS=1
- WITH_BF_BINRELOC=0
- WITH_BF_STATICOPENGL=0
- WITH_BF_OPENMP=${enable_openmp}
- EOF
-
- # configure WITH_BF* Scons build options
- for arg in \
- 'elbeem fluid' \
- 'sdl' \
- 'apidoc docs' \
- 'jack' \
- 'sndfile' \
- 'openexr' \
- 'dds' \
- 'fftw fftw3' \
- 'jpeg2k openjpeg' \
- 'openal'\
- 'ffmpeg' \
- 'ffmpeg ogg' \
- 'player' \
- 'sse rayoptimization' \
- 'redcode' \
- 'collada' \
- '3dmouse' ; do
- blend_with ${arg}
- done
-
- # add system media-libs/opencollada into Scons build options.
- echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
- echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
-
- # enable debugging/testing support
- is-flag "-g*" && echo "BF_DEBUG=1" >> "${S}"/user-config.py
- #use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-
- # enables Cycles render engine
- if use cycles; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_CYCLES=1
- WITH_BF_OIIO=1
- BF_OIIO="/usr"
- BF_OIIO_INC="/usr/include"
- BF_OIIO_LIB="OpenImageIO"
- WITH_BF_BOOST=1
- BF_BOOST="/usr"
- BF_BOOST_INC="/usr/include/boost"
- EOF
- fi
-
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-}
-
-src_install() {
- # creating binary wrapper
- cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
- #!/bin/sh
-
- # stop this script if the local blender path is a symlink
- if [ -L \${HOME}/.blender ]; then
- echo "Detected a symbolic link for \${HOME}/.blender"
- echo "Sorry, to avoid dangerous situations, the Blender binary can"
- echo "not be started until you have removed the symbolic link:"
- echo " # rm -i \${HOME}/.blender"
- exit 1
- fi
-
- export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts"
- export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles"
- export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV}/plugins"
- exec /usr/bin/blender-bin-${PV} \$*
- EOF
-
- # Pax mark blender for hardened support.
- pax-mark m "${WORKDIR}/install/blender"
-
- # install binaries
- exeinto /usr/bin/
- cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-${PV}"
- if use player; then
- cp "${WORKDIR}/install/blenderplayer" \
- "${WORKDIR}/install/blenderplayer-${PV}"
- doexe "${WORKDIR}/install/blenderplayer-${PV}"
- fi
-
- # install plugin headers
- insinto /usr/include/${PN}/${PV}
- doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
-
- # install contrib scripts addons
- insinto /usr/share/${PN}/${PV}/scripts
- use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
-
- # install desktop file
- insinto /usr/share/pixmaps
- cp release/freedesktop/icons/scalable/apps/blender.svg \
- release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- insinto /usr/share/applications
- cp release/freedesktop/blender.desktop \
- release/freedesktop/blender-${PV}.desktop
- doins release/freedesktop/blender-${PV}.desktop
- newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
-
- # install docs
- doman "${WORKDIR}"/${P}/doc/manpage/blender.1
- use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
- if use apidoc; then
-
- einfo "Generating (BGE) Blender Game Engine API docs ..."
- epydoc source/gameengine/PyDoc/*.py -v \
- -o doc/BGE_API \
- --quiet --quiet --quiet \
- --simple-term \
- --url "http://www.blender.org" \
- --top API_intro \
- --name "Blender GameEngine" \
- --no-private --no-sourcecode \
- --inheritance=included \
- --graph=all \
- --dotpath /usr/bin/dot \
- || die "epydoc failed."
- docinto "API/gameengine"
- dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
- #einfo "Generating (BPY) Blender Python API docs ..."
- "${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py || die "blender failed."
- pushd doc/python_api > /dev/null
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- popd > /dev/null
- docinto "API/python"
- dohtml -r doc/python_api/BPY_API/*
-
- einfo "Generating Blender C/C++ API docs ..."
- pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
- docinto "API/blender"
- dohtml -r html/*
- popd > /dev/null
- fi
-
- # final cleanup
- rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
- if [[ -z ${LINGUAS} || ${LINGUAS} == "en" ]]; then
- rm -r "${WORKDIR}/install/${PV}/datafiles/locale"
- else
- for x in "${WORKDIR}"/install/${PV}/datafiles/locale/* ; do
- mylang=${x##*/}
- has ${mylang} ${LINGUAS} || rm -r ${x}
- done
- fi
-
- # installing blender
- insinto /usr/share/${PN}/${PV}
- doins -r "${WORKDIR}"/install/${PV}/*
-
- # FIX: making all python scripts readable only by group 'users',
- # so nobody can modify scripts apart root user, but python
- # cache (*.pyc) can be written and shared across the users.
-# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-pkg_postinst() {
- echo
- 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
-}
diff --git a/media-gfx/blender/blender-2.61.ebuild b/media-gfx/blender/blender-2.61.ebuild
deleted file mode 100644
index def5006..0000000
--- a/media-gfx/blender/blender-2.61.ebuild
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit scons-utils eutils python versionator flag-o-matic toolchain-funcs ${SCM}
-
-IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
- +dds debug doc fftw jack apidoc sndfile lcms tweak-mode sdl sse \
- redcode +zlib iconv contrib 3dmouse"
-
-LANGS="en ar bg ca cs de el es fi fr hr it ja ko nl pl pt_BR ro ru sr sv uk zh_CN"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
- SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
- media-libs/libpng
- x11-libs/libXi
- x11-libs/libX11
- media-libs/tiff
- media-libs/libsamplerate
- virtual/opengl
- >=media-libs/freetype-2.0
- virtual/libintl
- media-libs/glew
- >=sci-physics/bullet-2.76
- dev-cpp/eigen:3
- cycles? (
- media-libs/openimageio
- dev-libs/boost
- )
- iconv? ( virtual/libiconv )
- zlib? ( sys-libs/zlib )
- sdl? ( media-libs/libsdl[audio,joystick] )
- openexr? ( media-libs/openexr )
- ffmpeg? (
- >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
- )
- openal? ( >=media-libs/openal-1.6.372 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- sndfile? ( media-libs/libsndfile )
- lcms? ( media-libs/lcms )
- 3dmouse? ( dev-libs/libspnav )"
-
-DEPEND="dev-util/scons
- apidoc? (
- dev-python/sphinx
- app-doc/doxygen[-nodot]
- game-engine? ( dev-python/epydoc )
- )
- ${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
- DEPEND="${DEPEND}
- sys-devel/gettext"
-fi
-
-blend_with() {
- local UWORD="$2"
- [ -z "${UWORD}" ] && UWORD="$1"
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
- subversion_fetch
- if use contrib; then
- S="${S}"/release/scripts/addons_contrib subversion_fetch \
- "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
- fi
-else
- unpack ${A}
-fi
-}
-
-pkg_setup() {
- enable_openmp=0
- if use openmp; then
- if tc-has-openmp; then
- enable_openmp=1
- else
- ewarn "You are using gcc built without 'openmp' USE."
- ewarn "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
- fi
- python_set_active_version 3
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
-
- # TODO: write a proper Makefile to replace the borked bmake script
- epatch "${FILESDIR}"/${PN}-${SLOT}-bmake.patch
- chmod 755 "${WORKDIR}"/${P}/release/plugins/bmake
-
- # OpenJPEG
- einfo "Removing bundled OpenJPEG ..."
- rm -r extern/libopenjpeg
- epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
- # Glew
- einfo "Removing bundled Glew ..."
- rm -r extern/glew
- epatch "${FILESDIR}"/${P}-glew.patch
-
- # Eigen3
- einfo "Removing bundled Eigen3 ..."
- rm -r extern/Eigen3
- epatch "${FILESDIR}"/${P}-eigen.patch
-
- # Bullet2
- einfo "Removing bundled Bullet2 ..."
- rm -r extern/bullet2
- epatch "${FILESDIR}"/${PN}-${SLOT}-bullet.patch
-
- # Linux 3.x (bug #381099)
- epatch "${FILESDIR}"/${PN}-${SLOT}-linux-3.patch
-
- epatch "${FILESDIR}"/${PN}-${SLOT}-libav-0.7.patch
- epatch "${FILESDIR}"/${P}-CVE-2009-3850-v3.patch
- epatch "${FILESDIR}"/${P}-enable_site_module.patch
-}
-
-src_configure() {
- # add system openjpeg into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG="/usr"
- BF_OPENJPEG_INC="/usr/include"
- BF_OPENJPEG_LIB="openjpeg"
- EOF
-
- # FIX: littlecms includes path aren't specified
- if use lcms; then
- cat <<- EOF >> "${S}"/user-config.py
- BF_LCMS_INC="/usr/include/"
- BF_LCMS_LIB="lcms"
- BF_LCMS_LIBPATH="/usr/lib/"
- EOF
- fi
-
- # add system sci-physic/bullet into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_BULLET=1
- BF_BULLET="/usr/include"
- BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
- BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
- EOF
-
- #add iconv into Scons build options.
- if use !elibc_glibc && use !elibc_uclibc && use iconv; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_ICONV=1
- BF_ICONV="/usr"
- EOF
- fi
-
- # configure internationalization only if LINGUAS have more
- # languages than 'en', otherwise must be disabled
- [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
- # configure Elbeem fluid system
- use elbeem || echo "BF_NO_ELBEEM=1" >> "${S}"/user-config.py
-
- # configure Tweak Mode
- use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
- # FIX: Game Engine module needs to be active to build the Blender Player
- if ! use game-engine && use player; then
- elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
- echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
- else
- blend_with game-engine gameengine
- fi
-
- # set CFLAGS used in /etc/make.conf correctly
- echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # set CXXFLAGS used in /etc/make.conf correctly
- local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset general options passed to the C/C++ compilers (useless hardcoded flags)
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
- # set LDFLAGS used in /etc/make.conf correctly
- local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset REL_* variables (useless hardcoded flags)
- cat <<- EOF >> "${S}"/user-config.py
- REL_CFLAGS=[]
- REL_CXXFLAGS=[]
- REL_CCFLAGS=[]
- EOF
-
- # reset warning flags (useless for NON blender developers)
- cat <<- EOF >> "${S}"/user-config.py
- C_WARN =[ '-w', '-g0' ]
- CC_WARN =[ '-w', '-g0' ]
- CXX_WARN=[ '-w', '-g0' ]
- EOF
-
- # detecting -j value from MAKEOPTS
- local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
- [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
- # generic settings which differ from the defaults from linux2-config.py
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
- BF_INSTALLDIR="../install"
- WITH_PYTHON_SECURITY=1
- WITHOUT_BF_PYTHON_INSTALL=1
- BF_PYTHON="/usr"
- BF_PYTHON_VERSION="3.2"
- BF_PYTHON_ABI_FLAGS=""
- BF_BUILDINFO=0
- BF_QUIET=1
- BF_NUMJOBS=${NUMJOBS}
- BF_LINE_OVERWRITE=0
- WITH_BF_FHS=1
- WITH_BF_BINRELOC=0
- WITH_BF_STATICOPENGL=0
- WITH_BF_OPENMP=${enable_openmp}
- EOF
-
- # configure WITH_BF* Scons build options
- for arg in \
- 'sdl' \
- 'apidoc docs' \
- 'lcms' \
- 'jack' \
- 'sndfile' \
- 'openexr' \
- 'dds' \
- 'fftw fftw3' \
- 'jpeg2k openjpeg' \
- 'openal'\
- 'ffmpeg' \
- 'ffmpeg ogg' \
- 'player' \
- 'sse rayoptimization' \
- 'redcode' \
- 'zlib' \
- '3dmouse' ; do
- blend_with ${arg}
- done
-
- # enable debugging/testing support
- use debug && echo "BF_DEBUG=1" >> "${S}"/user-config.py
- use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-
- # enables Cycles render engine
- if use cycles; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_CYCLES=1
- WITH_BF_OIIO=1
- BF_OIIO="/usr"
- BF_OIIO_INC="/usr/include"
- BF_OIIO_LIB="OpenImageIO"
- WITH_BF_BOOST=1
- BF_BOOST="/usr"
- BF_BOOST_INC="/usr/include/boost"
- EOF
- fi
-
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-
- einfo "Building plugins ..."
- # FIX: plugins are built without respecting user's LDFLAGS
- emake \
- CFLAGS="${CFLAGS} -fPIC" \
- LDFLAGS="$(raw-ldflags) -Bshareable" \
- -C release/plugins
-}
-
-src_install() {
- # creating binary wrapper
- cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
- #!/bin/sh
-
- # stop this script if the local blender path is a symlink
- if [ -L \${HOME}/.blender ]; then
- echo "Detected a symbolic link for \${HOME}/.blender"
- echo "Sorry, to avoid dangerous situations, the Blender binary can"
- echo "not be started until you have removed the symbolic link:"
- echo " # rm -i \${HOME}/.blender"
- exit 1
- fi
-
- export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts"
- export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles"
- export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV}/plugins"
- exec /usr/bin/blender-bin-${PV} \$*
- EOF
-
- # install binaries
- exeinto /usr/bin/
- cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-${PV}"
- if use player; then
- cp "${WORKDIR}/install/blenderplayer" \
- "${WORKDIR}/install/blenderplayer-${PV}"
- doexe "${WORKDIR}/install/blenderplayer-${PV}"
- fi
-
- # install plugins
- exeinto /usr/$(get_libdir)/${PN}/${PV}/plugins/texture
- doexe "${WORKDIR}"/${P}/release/plugins/texture/*.so
- exeinto /usr/$(get_libdir)/${PN}/${PV}/plugins/sequences
- doexe "${WORKDIR}"/${P}/release/plugins/sequence/*.so
- insinto /usr/include/${PN}/${PV}
- doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
- insinto /usr/share/${PN}/${PV}/scripts
- use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
-
- # install desktop file
- insinto /usr/share/pixmaps
- cp release/freedesktop/icons/scalable/apps/blender.svg \
- release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- insinto /usr/share/applications
- cp release/freedesktop/blender.desktop \
- release/freedesktop/blender-${PV}.desktop
- doins release/freedesktop/blender-${PV}.desktop
- newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
-
- # install docs
- doman "${WORKDIR}"/${P}/doc/manpage/blender.1
- use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
- if use apidoc; then
-
- einfo "Generating (BGE) Blender Game Engine API docs ..."
- epydoc source/gameengine/PyDoc/*.py -v \
- -o doc/BGE_API \
- --quiet --quiet --quiet \
- --simple-term \
- --url "http://www.blender.org" \
- --top API_intro \
- --name "Blender GameEngine" \
- --no-private --no-sourcecode \
- --inheritance=included \
- --graph=all \
- --dotpath /usr/bin/dot \
- || die "epydoc failed."
- docinto "API/gameengine"
- dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
- #einfo "Generating (BPY) Blender Python API docs ..."
- "${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py || die "blender failed."
- pushd doc/python_api > /dev/null
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- popd > /dev/null
- docinto "API/python"
- dohtml -r doc/python_api/BPY_API/*
-
- einfo "Generating Blender C/C++ API docs ..."
- pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
- docinto "API/blender"
- dohtml -r html/*
- popd > /dev/null
- fi
-
- # final cleanup
- rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
-
- # installing blender
- insinto /usr/share/${PN}/${PV}
- doins -r "${WORKDIR}"/install/${PV}/*
-
- # FIX: making all python scripts readable only by group 'users',
- # so nobody can modify scripts apart root user, but python
- # cache (*.pyc) can be written and shared across the users.
-# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-pkg_postinst() {
- echo
- 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
- elog "Blender has its own internal rendering engine but you"
- elog "can export to external renderers for image computation"
- elog "like: YafRay[1], sunflow[2], PovRay[3] and luxrender[4]"
- elog
- elog "If you need one of them just emerge it:"
- elog " [1] emerge -av media-gfx/yafray"
- elog " [2] emerge -av media-gfx/sunflow"
- elog " [3] emerge -av media-gfx/povray"
- elog " [4] emerge -av media-gfx/luxrender"
- elog
- elog "When setting the Blender paths with the User Preferences"
- elog "dialog box, remember to NOT declare your home's paths as:"
- elog "~/.blender, but as: /home/user/.blender; in other words,"
- elog "DO NOT USE the tilde inside the paths, as Blender is not"
- elog "able to handle it, ignoring your customizations."
-}
diff --git a/media-gfx/blender/blender-2.62-r1.ebuild b/media-gfx/blender/blender-2.62-r1.ebuild
deleted file mode 100644
index db6816f..0000000
--- a/media-gfx/blender/blender-2.62-r1.ebuild
+++ /dev/null
@@ -1,449 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils ${SCM}
-
-IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
- +dds doc fftw jack apidoc sndfile tweak-mode sdl sse \
- redcode iconv contrib collada 3dmouse"
-
-LANGS="en ar bg ca cs de el es es_ES es_MX fa fi fr id it ja ne pl pt_BR ru sr sv uk zh_CN zh_TW"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
- SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
- media-libs/libpng:0
- x11-libs/libXi
- x11-libs/libX11
- media-libs/tiff:0
- media-libs/libsamplerate
- virtual/opengl
- >=media-libs/freetype-2.0
- virtual/libintl
- media-libs/glew
- >=sci-physics/bullet-2.78[-double-precision]
- dev-cpp/eigen:3
- sci-libs/colamd
- sys-libs/zlib
- cycles? (
- media-libs/openimageio
- dev-libs/boost
- )
- iconv? ( virtual/libiconv )
- sdl? ( media-libs/libsdl[audio,joystick] )
- openexr? ( media-libs/openexr )
- ffmpeg? (
- >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
- )
- openal? ( >=media-libs/openal-1.6.372 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- sndfile? ( media-libs/libsndfile )
- collada? ( media-libs/opencollada )
- 3dmouse? ( dev-libs/libspnav )"
-
-DEPEND="dev-util/scons
- apidoc? (
- dev-python/sphinx
- app-doc/doxygen[-nodot]
- game-engine? ( dev-python/epydoc )
- )
- ${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
- DEPEND="${DEPEND}
- sys-devel/gettext"
-fi
-
-blend_with() {
- local UWORD="$2"
- [ -z "${UWORD}" ] && UWORD="$1"
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
- subversion_fetch
- if use contrib; then
- S="${S}"/release/scripts/addons_contrib subversion_fetch \
- "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
- fi
-else
- unpack ${A}
-fi
-}
-
-pkg_setup() {
- enable_openmp=0
- if use openmp; then
- if tc-has-openmp; then
- enable_openmp=1
- else
- ewarn "You are using gcc built without 'openmp' USE."
- ewarn "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
- fi
- python_set_active_version 3
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
- epatch "${FILESDIR}"/${P}-collada.patch
-
- # OpenJPEG
- einfo "Removing bundled OpenJPEG ..."
- rm -r extern/libopenjpeg
- epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
- # Glew
- einfo "Removing bundled Glew ..."
- rm -r extern/glew
- epatch "${FILESDIR}"/${P}-glew.patch
-
- # Eigen3
- einfo "Removing bundled Eigen3 ..."
- rm -r extern/Eigen3
- epatch "${FILESDIR}"/${P}-eigen.patch
-
- # Bullet2
- einfo "Removing bundled Bullet2 ..."
- rm -r extern/bullet2
- epatch "${FILESDIR}"/${PN}-${SLOT}-bullet.patch
-
- # Colamd
- einfo "Removing bundled Colamd ..."
- rm -r extern/colamd
- epatch "${FILESDIR}"/${P}-colamd.patch
-
- ewarn "$(echo "Remaining bundled dependencies:";
- find extern -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
-
- # Linux 3.x (bug #381099)
- epatch "${FILESDIR}"/${PN}-${SLOT}-linux-3.patch
-
- epatch "${FILESDIR}"/${PN}-${SLOT}-libav-0.7.patch
- epatch "${FILESDIR}"/${P}-CVE-2009-3850-v4.patch
- epatch "${FILESDIR}"/${P}-enable_site_module.patch
- epatch "${FILESDIR}"/${P}-opencollada-debug.patch
-
- # fix undeclared false in jp2.c
- epatch "${FILESDIR}"/${P}-jp2.patch
-}
-
-src_configure() {
- # add system openjpeg into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG="/usr"
- BF_OPENJPEG_INC="/usr/include"
- BF_OPENJPEG_LIB="openjpeg"
- EOF
-
- # add system sci-physic/bullet into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_BULLET=1
- BF_BULLET="/usr/include"
- BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
- BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
- EOF
-
- # add system sci-libs/colamd into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_COLAMD=1
- BF_COLAMD="/usr"
- BF_COLAMD_INC="/usr/include"
- BF_COLAMD_LIB="colamd"
- EOF
-
- #add iconv into Scons build options.
- if use !elibc_glibc && use !elibc_uclibc && use iconv; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_ICONV=1
- BF_ICONV="/usr"
- EOF
- fi
-
- # configure internationalization only if LINGUAS have more
- # languages than 'en', otherwise must be disabled
- [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
- # Ocean sim system needs fftw
- use fftw || echo "WITH_BF_OCEANSIM=0" >> "${S}"/user-config.py
-
- # configure Tweak Mode
- use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
- # FIX: Game Engine module needs to be active to build the Blender Player
- if ! use game-engine && use player; then
- elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
- echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
- else
- blend_with game-engine gameengine
- fi
-
- # set CFLAGS used in /etc/make.conf correctly
- echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # set CXXFLAGS used in /etc/make.conf correctly
- local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset general options passed to the C/C++ compilers (useless hardcoded flags)
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
- # set LDFLAGS used in /etc/make.conf correctly
- local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset REL_* variables (useless hardcoded flags)
- cat <<- EOF >> "${S}"/user-config.py
- REL_CFLAGS=[]
- REL_CXXFLAGS=[]
- REL_CCFLAGS=[]
- EOF
-
- # reset warning flags (useless for NON blender developers)
- cat <<- EOF >> "${S}"/user-config.py
- C_WARN =[ '-w', '-g0' ]
- CC_WARN =[ '-w', '-g0' ]
- CXX_WARN=[ '-w', '-g0' ]
- EOF
-
- # detecting -j value from MAKEOPTS
- local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
- [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
- # generic settings which differ from the defaults from linux2-config.py
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
- BF_INSTALLDIR="../install"
- WITH_PYTHON_SECURITY=1
- WITHOUT_BF_PYTHON_INSTALL=1
- BF_PYTHON="/usr"
- BF_PYTHON_VERSION="3.2"
- BF_PYTHON_ABI_FLAGS=""
- BF_BUILDINFO=0
- BF_QUIET=1
- BF_NUMJOBS=${NUMJOBS}
- BF_LINE_OVERWRITE=0
- WITH_BF_FHS=1
- WITH_BF_BINRELOC=0
- WITH_BF_STATICOPENGL=0
- WITH_BF_OPENMP=${enable_openmp}
- EOF
-
- # configure WITH_BF* Scons build options
- for arg in \
- 'elbeem fluid' \
- 'sdl' \
- 'apidoc docs' \
- 'jack' \
- 'sndfile' \
- 'openexr' \
- 'dds' \
- 'fftw fftw3' \
- 'jpeg2k openjpeg' \
- 'openal'\
- 'ffmpeg' \
- 'ffmpeg ogg' \
- 'player' \
- 'sse rayoptimization' \
- 'redcode' \
- 'collada' \
- '3dmouse' ; do
- blend_with ${arg}
- done
-
- # add system media-libs/opencollada into Scons build options.
- echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
- echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
-
- # enable debugging/testing support
- is-flag "-g*" && echo "BF_DEBUG=1" >> "${S}"/user-config.py
- #use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-
- # enables Cycles render engine
- if use cycles; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_CYCLES=1
- WITH_BF_OIIO=1
- BF_OIIO="/usr"
- BF_OIIO_INC="/usr/include"
- BF_OIIO_LIB="OpenImageIO"
- WITH_BF_BOOST=1
- BF_BOOST="/usr"
- BF_BOOST_INC="/usr/include/boost"
- EOF
- fi
-
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-}
-
-src_install() {
- # creating binary wrapper
- cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
- #!/bin/sh
-
- # stop this script if the local blender path is a symlink
- if [ -L \${HOME}/.blender ]; then
- echo "Detected a symbolic link for \${HOME}/.blender"
- echo "Sorry, to avoid dangerous situations, the Blender binary can"
- echo "not be started until you have removed the symbolic link:"
- echo " # rm -i \${HOME}/.blender"
- exit 1
- fi
-
- export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts"
- export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles"
- export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV}/plugins"
- exec /usr/bin/blender-bin-${PV} \$*
- EOF
-
- # Pax mark blender for hardened support.
- pax-mark m "${WORKDIR}/install/blender"
-
- # install binaries
- exeinto /usr/bin/
- cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-${PV}"
- if use player; then
- cp "${WORKDIR}/install/blenderplayer" \
- "${WORKDIR}/install/blenderplayer-${PV}"
- doexe "${WORKDIR}/install/blenderplayer-${PV}"
- fi
-
- # install plugin headers
- insinto /usr/include/${PN}/${PV}
- doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
-
- # install contrib scripts addons
- insinto /usr/share/${PN}/${PV}/scripts
- use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
-
- # install desktop file
- insinto /usr/share/pixmaps
- cp release/freedesktop/icons/scalable/apps/blender.svg \
- release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- insinto /usr/share/applications
- cp release/freedesktop/blender.desktop \
- release/freedesktop/blender-${PV}.desktop
- doins release/freedesktop/blender-${PV}.desktop
- newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
-
- # install docs
- doman "${WORKDIR}"/${P}/doc/manpage/blender.1
- use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
- if use apidoc; then
-
- einfo "Generating (BGE) Blender Game Engine API docs ..."
- epydoc source/gameengine/PyDoc/*.py -v \
- -o doc/BGE_API \
- --quiet --quiet --quiet \
- --simple-term \
- --url "http://www.blender.org" \
- --top API_intro \
- --name "Blender GameEngine" \
- --no-private --no-sourcecode \
- --inheritance=included \
- --graph=all \
- --dotpath /usr/bin/dot \
- || die "epydoc failed."
- docinto "API/gameengine"
- dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
- #einfo "Generating (BPY) Blender Python API docs ..."
- "${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py || die "blender failed."
- pushd doc/python_api > /dev/null
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- popd > /dev/null
- docinto "API/python"
- dohtml -r doc/python_api/BPY_API/*
-
- einfo "Generating Blender C/C++ API docs ..."
- pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
- docinto "API/blender"
- dohtml -r html/*
- popd > /dev/null
- fi
-
- # final cleanup
- rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
- if [[ -z ${LINGUAS} || ${LINGUAS} == "en" ]]; then
- rm -r "${WORKDIR}/install/${PV}/datafiles/locale"
- else
- for x in "${WORKDIR}"/install/${PV}/datafiles/locale/* ; do
- mylang=${x##*/}
- has ${mylang} ${LINGUAS} || rm -r ${x}
- done
- fi
-
- # installing blender
- insinto /usr/share/${PN}/${PV}
- doins -r "${WORKDIR}"/install/${PV}/*
-
- # FIX: making all python scripts readable only by group 'users',
- # so nobody can modify scripts apart root user, but python
- # cache (*.pyc) can be written and shared across the users.
-# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-pkg_postinst() {
- echo
- 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
-}
diff --git a/media-gfx/blender/blender-2.62-r2.ebuild b/media-gfx/blender/blender-2.62-r2.ebuild
deleted file mode 100644
index 0157144..0000000
--- a/media-gfx/blender/blender-2.62-r2.ebuild
+++ /dev/null
@@ -1,450 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils ${SCM}
-
-IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
- +dds doc fftw jack apidoc sndfile tweak-mode sdl sse \
- redcode iconv contrib collada 3dmouse"
-
-LANGS="en ar bg ca cs de el es es_ES es_MX fa fi fr id it ja ne pl pt_BR ru sr sv uk zh_CN zh_TW"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
- SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
- media-libs/libpng:0
- x11-libs/libXi
- x11-libs/libX11
- media-libs/tiff:0
- media-libs/libsamplerate
- virtual/opengl
- >=media-libs/freetype-2.0
- virtual/libintl
- media-libs/glew
- >=sci-physics/bullet-2.78[-double-precision]
- dev-cpp/eigen:3
- sci-libs/colamd
- sys-libs/zlib
- cycles? (
- media-libs/openimageio
- dev-libs/boost
- )
- iconv? ( virtual/libiconv )
- sdl? ( media-libs/libsdl[audio,joystick] )
- openexr? ( media-libs/openexr )
- ffmpeg? (
- >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
- )
- openal? ( >=media-libs/openal-1.6.372 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- sndfile? ( media-libs/libsndfile )
- collada? ( media-libs/opencollada )
- 3dmouse? ( dev-libs/libspnav )"
-
-DEPEND="dev-util/scons
- apidoc? (
- dev-python/sphinx
- app-doc/doxygen[-nodot]
- game-engine? ( dev-python/epydoc )
- )
- ${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
- DEPEND="${DEPEND}
- sys-devel/gettext"
-fi
-
-blend_with() {
- local UWORD="$2"
- [ -z "${UWORD}" ] && UWORD="$1"
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
- subversion_fetch
- if use contrib; then
- S="${S}"/release/scripts/addons_contrib subversion_fetch \
- "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
- fi
-else
- unpack ${A}
-fi
-}
-
-pkg_setup() {
- enable_openmp=0
- if use openmp; then
- if tc-has-openmp; then
- enable_openmp=1
- else
- ewarn "You are using gcc built without 'openmp' USE."
- ewarn "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
- fi
- python_set_active_version 3
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
- epatch "${FILESDIR}"/${P}-collada.patch
- epatch "${FILESDIR}"/${P}-doxyfile.patch
-
- # OpenJPEG
- einfo "Removing bundled OpenJPEG ..."
- rm -r extern/libopenjpeg
- epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
- # Glew
- einfo "Removing bundled Glew ..."
- rm -r extern/glew
- epatch "${FILESDIR}"/${P}-glew.patch
-
- # Eigen3
- einfo "Removing bundled Eigen3 ..."
- rm -r extern/Eigen3
- epatch "${FILESDIR}"/${P}-eigen.patch
-
- # Bullet2
- einfo "Removing bundled Bullet2 ..."
- rm -r extern/bullet2
- epatch "${FILESDIR}"/${PN}-${SLOT}-bullet.patch
-
- # Colamd
- einfo "Removing bundled Colamd ..."
- rm -r extern/colamd
- epatch "${FILESDIR}"/${P}-colamd.patch
-
- ewarn "$(echo "Remaining bundled dependencies:";
- find extern -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
-
- # Linux 3.x (bug #381099)
- epatch "${FILESDIR}"/${PN}-${SLOT}-linux-3.patch
-
- epatch "${FILESDIR}"/${PN}-${SLOT}-libav-0.7.patch
- epatch "${FILESDIR}"/${P}-CVE-2009-3850-v4.patch
- epatch "${FILESDIR}"/${P}-enable_site_module.patch
- epatch "${FILESDIR}"/${P}-opencollada-debug.patch
-
- # fix undeclared false in jp2.c
- epatch "${FILESDIR}"/${P}-jp2.patch
-}
-
-src_configure() {
- # add system openjpeg into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG="/usr"
- BF_OPENJPEG_INC="/usr/include"
- BF_OPENJPEG_LIB="openjpeg"
- EOF
-
- # add system sci-physic/bullet into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_BULLET=1
- BF_BULLET="/usr/include"
- BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
- BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
- EOF
-
- # add system sci-libs/colamd into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_COLAMD=1
- BF_COLAMD="/usr"
- BF_COLAMD_INC="/usr/include"
- BF_COLAMD_LIB="colamd"
- EOF
-
- #add iconv into Scons build options.
- if use !elibc_glibc && use !elibc_uclibc && use iconv; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_ICONV=1
- BF_ICONV="/usr"
- EOF
- fi
-
- # configure internationalization only if LINGUAS have more
- # languages than 'en', otherwise must be disabled
- [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
- # Ocean sim system needs fftw
- use fftw || echo "WITH_BF_OCEANSIM=0" >> "${S}"/user-config.py
-
- # configure Tweak Mode
- use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
- # FIX: Game Engine module needs to be active to build the Blender Player
- if ! use game-engine && use player; then
- elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
- echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
- else
- blend_with game-engine gameengine
- fi
-
- # set CFLAGS used in /etc/make.conf correctly
- echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # set CXXFLAGS used in /etc/make.conf correctly
- local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset general options passed to the C/C++ compilers (useless hardcoded flags)
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
- # set LDFLAGS used in /etc/make.conf correctly
- local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset REL_* variables (useless hardcoded flags)
- cat <<- EOF >> "${S}"/user-config.py
- REL_CFLAGS=[]
- REL_CXXFLAGS=[]
- REL_CCFLAGS=[]
- EOF
-
- # reset warning flags (useless for NON blender developers)
- cat <<- EOF >> "${S}"/user-config.py
- C_WARN =[ '-w', '-g0' ]
- CC_WARN =[ '-w', '-g0' ]
- CXX_WARN=[ '-w', '-g0' ]
- EOF
-
- # detecting -j value from MAKEOPTS
- local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
- [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
- # generic settings which differ from the defaults from linux2-config.py
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
- BF_INSTALLDIR="../install"
- WITH_PYTHON_SECURITY=1
- WITHOUT_BF_PYTHON_INSTALL=1
- BF_PYTHON="/usr"
- BF_PYTHON_VERSION="3.2"
- BF_PYTHON_ABI_FLAGS=""
- BF_BUILDINFO=0
- BF_QUIET=1
- BF_NUMJOBS=${NUMJOBS}
- BF_LINE_OVERWRITE=0
- WITH_BF_FHS=1
- WITH_BF_BINRELOC=0
- WITH_BF_STATICOPENGL=0
- WITH_BF_OPENMP=${enable_openmp}
- EOF
-
- # configure WITH_BF* Scons build options
- for arg in \
- 'elbeem fluid' \
- 'sdl' \
- 'apidoc docs' \
- 'jack' \
- 'sndfile' \
- 'openexr' \
- 'dds' \
- 'fftw fftw3' \
- 'jpeg2k openjpeg' \
- 'openal'\
- 'ffmpeg' \
- 'ffmpeg ogg' \
- 'player' \
- 'sse rayoptimization' \
- 'redcode' \
- 'collada' \
- '3dmouse' ; do
- blend_with ${arg}
- done
-
- # add system media-libs/opencollada into Scons build options.
- echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
- echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
-
- # enable debugging/testing support
- is-flag "-g*" && echo "BF_DEBUG=1" >> "${S}"/user-config.py
- #use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-
- # enables Cycles render engine
- if use cycles; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_CYCLES=1
- WITH_BF_OIIO=1
- BF_OIIO="/usr"
- BF_OIIO_INC="/usr/include"
- BF_OIIO_LIB="OpenImageIO"
- WITH_BF_BOOST=1
- BF_BOOST="/usr"
- BF_BOOST_INC="/usr/include/boost"
- EOF
- fi
-
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-}
-
-src_install() {
- # creating binary wrapper
- cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
- #!/bin/sh
-
- # stop this script if the local blender path is a symlink
- if [ -L \${HOME}/.blender ]; then
- echo "Detected a symbolic link for \${HOME}/.blender"
- echo "Sorry, to avoid dangerous situations, the Blender binary can"
- echo "not be started until you have removed the symbolic link:"
- echo " # rm -i \${HOME}/.blender"
- exit 1
- fi
-
- export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts"
- export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles"
- export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV}/plugins"
- exec /usr/bin/blender-bin-${PV} \$*
- EOF
-
- # Pax mark blender for hardened support.
- pax-mark m "${WORKDIR}/install/blender"
-
- # install binaries
- exeinto /usr/bin/
- cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-${PV}"
- if use player; then
- cp "${WORKDIR}/install/blenderplayer" \
- "${WORKDIR}/install/blenderplayer-${PV}"
- doexe "${WORKDIR}/install/blenderplayer-${PV}"
- fi
-
- # install plugin headers
- insinto /usr/include/${PN}/${PV}
- doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
-
- # install contrib scripts addons
- insinto /usr/share/${PN}/${PV}/scripts
- use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
-
- # install desktop file
- insinto /usr/share/pixmaps
- cp release/freedesktop/icons/scalable/apps/blender.svg \
- release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- insinto /usr/share/applications
- cp release/freedesktop/blender.desktop \
- release/freedesktop/blender-${PV}.desktop
- doins release/freedesktop/blender-${PV}.desktop
- newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
-
- # install docs
- doman "${WORKDIR}"/${P}/doc/manpage/blender.1
- use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
- if use apidoc; then
-
- einfo "Generating (BGE) Blender Game Engine API docs ..."
- epydoc source/gameengine/PyDoc/*.py -v \
- -o doc/BGE_API \
- --quiet --quiet --quiet \
- --simple-term \
- --url "http://www.blender.org" \
- --top API_intro \
- --name "Blender GameEngine" \
- --no-private --no-sourcecode \
- --inheritance=included \
- --graph=all \
- --dotpath /usr/bin/dot \
- || die "epydoc failed."
- docinto "API/gameengine"
- dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
- #einfo "Generating (BPY) Blender Python API docs ..."
- "${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py --noaudio || die "blender failed."
- pushd doc/python_api > /dev/null
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- popd > /dev/null
- docinto "API/python"
- dohtml -r doc/python_api/BPY_API/*
-
- einfo "Generating Blender C/C++ API docs ..."
- pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
- docinto "API/blender"
- dohtml -r html/*
- popd > /dev/null
- fi
-
- # final cleanup
- rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
- if [[ -z ${LINGUAS} || ${LINGUAS} == "en" ]]; then
- rm -r "${WORKDIR}/install/${PV}/datafiles/locale"
- else
- for x in "${WORKDIR}"/install/${PV}/datafiles/locale/* ; do
- mylang=${x##*/}
- has ${mylang} ${LINGUAS} || rm -r ${x}
- done
- fi
-
- # installing blender
- insinto /usr/share/${PN}/${PV}
- doins -r "${WORKDIR}"/install/${PV}/*
-
- # FIX: making all python scripts readable only by group 'users',
- # so nobody can modify scripts apart root user, but python
- # cache (*.pyc) can be written and shared across the users.
-# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-pkg_postinst() {
- echo
- 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
-}
diff --git a/media-gfx/blender/blender-2.62.ebuild b/media-gfx/blender/blender-2.62.ebuild
deleted file mode 100644
index 7627542..0000000
--- a/media-gfx/blender/blender-2.62.ebuild
+++ /dev/null
@@ -1,446 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils ${SCM}
-
-IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
- +dds doc fftw jack apidoc sndfile tweak-mode sdl sse \
- redcode iconv contrib collada 3dmouse"
-
-LANGS="en ar bg ca cs de el es es_ES es_MX fa fi fr id it ja ne pl pt_BR ru sr sv uk zh_CN zh_TW"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
- SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
- media-libs/libpng:0
- x11-libs/libXi
- x11-libs/libX11
- media-libs/tiff:0
- media-libs/libsamplerate
- virtual/opengl
- >=media-libs/freetype-2.0
- virtual/libintl
- media-libs/glew
- >=sci-physics/bullet-2.78[-double-precision]
- dev-cpp/eigen:3
- sci-libs/colamd
- sys-libs/zlib
- cycles? (
- media-libs/openimageio
- dev-libs/boost
- )
- iconv? ( virtual/libiconv )
- sdl? ( media-libs/libsdl[audio,joystick] )
- openexr? ( media-libs/openexr )
- ffmpeg? (
- >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
- )
- openal? ( >=media-libs/openal-1.6.372 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- sndfile? ( media-libs/libsndfile )
- collada? ( media-libs/opencollada )
- 3dmouse? ( dev-libs/libspnav )"
-
-DEPEND="dev-util/scons
- apidoc? (
- dev-python/sphinx
- app-doc/doxygen[-nodot]
- game-engine? ( dev-python/epydoc )
- )
- ${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
- DEPEND="${DEPEND}
- sys-devel/gettext"
-fi
-
-blend_with() {
- local UWORD="$2"
- [ -z "${UWORD}" ] && UWORD="$1"
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
- subversion_fetch
- if use contrib; then
- S="${S}"/release/scripts/addons_contrib subversion_fetch \
- "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
- fi
-else
- unpack ${A}
-fi
-}
-
-pkg_setup() {
- enable_openmp=0
- if use openmp; then
- if tc-has-openmp; then
- enable_openmp=1
- else
- ewarn "You are using gcc built without 'openmp' USE."
- ewarn "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
- fi
- python_set_active_version 3
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
- epatch "${FILESDIR}"/${P}-collada.patch
-
- # OpenJPEG
- einfo "Removing bundled OpenJPEG ..."
- rm -r extern/libopenjpeg
- epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
- # Glew
- einfo "Removing bundled Glew ..."
- rm -r extern/glew
- epatch "${FILESDIR}"/${P}-glew.patch
-
- # Eigen3
- einfo "Removing bundled Eigen3 ..."
- rm -r extern/Eigen3
- epatch "${FILESDIR}"/${P}-eigen.patch
-
- # Bullet2
- einfo "Removing bundled Bullet2 ..."
- rm -r extern/bullet2
- epatch "${FILESDIR}"/${PN}-${SLOT}-bullet.patch
-
- # Colamd
- einfo "Removing bundled Colamd ..."
- rm -r extern/colamd
- epatch "${FILESDIR}"/${P}-colamd.patch
-
- ewarn "$(echo "Remaining bundled dependencies:";
- find extern -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
-
- # Linux 3.x (bug #381099)
- epatch "${FILESDIR}"/${PN}-${SLOT}-linux-3.patch
-
- epatch "${FILESDIR}"/${PN}-${SLOT}-libav-0.7.patch
- epatch "${FILESDIR}"/${P}-CVE-2009-3850-v4.patch
- epatch "${FILESDIR}"/${P}-enable_site_module.patch
- epatch "${FILESDIR}"/${P}-opencollada-debug.patch
-}
-
-src_configure() {
- # add system openjpeg into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG="/usr"
- BF_OPENJPEG_INC="/usr/include"
- BF_OPENJPEG_LIB="openjpeg"
- EOF
-
- # add system sci-physic/bullet into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_BULLET=1
- BF_BULLET="/usr/include"
- BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
- BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
- EOF
-
- # add system sci-libs/colamd into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_COLAMD=1
- BF_COLAMD="/usr"
- BF_COLAMD_INC="/usr/include"
- BF_COLAMD_LIB="colamd"
- EOF
-
- #add iconv into Scons build options.
- if use !elibc_glibc && use !elibc_uclibc && use iconv; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_ICONV=1
- BF_ICONV="/usr"
- EOF
- fi
-
- # configure internationalization only if LINGUAS have more
- # languages than 'en', otherwise must be disabled
- [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
- # Ocean sim system needs fftw
- use fftw || echo "WITH_BF_OCEANSIM=0" >> "${S}"/user-config.py
-
- # configure Tweak Mode
- use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
- # FIX: Game Engine module needs to be active to build the Blender Player
- if ! use game-engine && use player; then
- elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
- echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
- else
- blend_with game-engine gameengine
- fi
-
- # set CFLAGS used in /etc/make.conf correctly
- echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # set CXXFLAGS used in /etc/make.conf correctly
- local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset general options passed to the C/C++ compilers (useless hardcoded flags)
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
- # set LDFLAGS used in /etc/make.conf correctly
- local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset REL_* variables (useless hardcoded flags)
- cat <<- EOF >> "${S}"/user-config.py
- REL_CFLAGS=[]
- REL_CXXFLAGS=[]
- REL_CCFLAGS=[]
- EOF
-
- # reset warning flags (useless for NON blender developers)
- cat <<- EOF >> "${S}"/user-config.py
- C_WARN =[ '-w', '-g0' ]
- CC_WARN =[ '-w', '-g0' ]
- CXX_WARN=[ '-w', '-g0' ]
- EOF
-
- # detecting -j value from MAKEOPTS
- local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
- [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
- # generic settings which differ from the defaults from linux2-config.py
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
- BF_INSTALLDIR="../install"
- WITH_PYTHON_SECURITY=1
- WITHOUT_BF_PYTHON_INSTALL=1
- BF_PYTHON="/usr"
- BF_PYTHON_VERSION="3.2"
- BF_PYTHON_ABI_FLAGS=""
- BF_BUILDINFO=0
- BF_QUIET=1
- BF_NUMJOBS=${NUMJOBS}
- BF_LINE_OVERWRITE=0
- WITH_BF_FHS=1
- WITH_BF_BINRELOC=0
- WITH_BF_STATICOPENGL=0
- WITH_BF_OPENMP=${enable_openmp}
- EOF
-
- # configure WITH_BF* Scons build options
- for arg in \
- 'elbeem fluid' \
- 'sdl' \
- 'apidoc docs' \
- 'jack' \
- 'sndfile' \
- 'openexr' \
- 'dds' \
- 'fftw fftw3' \
- 'jpeg2k openjpeg' \
- 'openal'\
- 'ffmpeg' \
- 'ffmpeg ogg' \
- 'player' \
- 'sse rayoptimization' \
- 'redcode' \
- 'collada' \
- '3dmouse' ; do
- blend_with ${arg}
- done
-
- # add system media-libs/opencollada into Scons build options.
- echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
- echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
-
- # enable debugging/testing support
- is-flag "-g*" && echo "BF_DEBUG=1" >> "${S}"/user-config.py
- #use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-
- # enables Cycles render engine
- if use cycles; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_CYCLES=1
- WITH_BF_OIIO=1
- BF_OIIO="/usr"
- BF_OIIO_INC="/usr/include"
- BF_OIIO_LIB="OpenImageIO"
- WITH_BF_BOOST=1
- BF_BOOST="/usr"
- BF_BOOST_INC="/usr/include/boost"
- EOF
- fi
-
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-}
-
-src_install() {
- # creating binary wrapper
- cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
- #!/bin/sh
-
- # stop this script if the local blender path is a symlink
- if [ -L \${HOME}/.blender ]; then
- echo "Detected a symbolic link for \${HOME}/.blender"
- echo "Sorry, to avoid dangerous situations, the Blender binary can"
- echo "not be started until you have removed the symbolic link:"
- echo " # rm -i \${HOME}/.blender"
- exit 1
- fi
-
- export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts"
- export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles"
- export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV}/plugins"
- exec /usr/bin/blender-bin-${PV} \$*
- EOF
-
- # Pax mark blender for hardened support.
- pax-mark m "${WORKDIR}/install/blender"
-
- # install binaries
- exeinto /usr/bin/
- cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-${PV}"
- if use player; then
- cp "${WORKDIR}/install/blenderplayer" \
- "${WORKDIR}/install/blenderplayer-${PV}"
- doexe "${WORKDIR}/install/blenderplayer-${PV}"
- fi
-
- # install plugin headers
- insinto /usr/include/${PN}/${PV}
- doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
-
- # install contrib scripts addons
- insinto /usr/share/${PN}/${PV}/scripts
- use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
-
- # install desktop file
- insinto /usr/share/pixmaps
- cp release/freedesktop/icons/scalable/apps/blender.svg \
- release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- insinto /usr/share/applications
- cp release/freedesktop/blender.desktop \
- release/freedesktop/blender-${PV}.desktop
- doins release/freedesktop/blender-${PV}.desktop
- newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
-
- # install docs
- doman "${WORKDIR}"/${P}/doc/manpage/blender.1
- use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
- if use apidoc; then
-
- einfo "Generating (BGE) Blender Game Engine API docs ..."
- epydoc source/gameengine/PyDoc/*.py -v \
- -o doc/BGE_API \
- --quiet --quiet --quiet \
- --simple-term \
- --url "http://www.blender.org" \
- --top API_intro \
- --name "Blender GameEngine" \
- --no-private --no-sourcecode \
- --inheritance=included \
- --graph=all \
- --dotpath /usr/bin/dot \
- || die "epydoc failed."
- docinto "API/gameengine"
- dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
- #einfo "Generating (BPY) Blender Python API docs ..."
- "${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py || die "blender failed."
- pushd doc/python_api > /dev/null
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- popd > /dev/null
- docinto "API/python"
- dohtml -r doc/python_api/BPY_API/*
-
- einfo "Generating Blender C/C++ API docs ..."
- pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
- docinto "API/blender"
- dohtml -r html/*
- popd > /dev/null
- fi
-
- # final cleanup
- rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
- if [[ -z ${LINGUAS} || ${LINGUAS} == "en" ]]; then
- rm -r "${WORKDIR}/install/${PV}/datafiles/locale"
- else
- for x in "${WORKDIR}"/install/${PV}/datafiles/locale/* ; do
- mylang=${x##*/}
- has ${mylang} ${LINGUAS} || rm -r ${x}
- done
- fi
-
- # installing blender
- insinto /usr/share/${PN}/${PV}
- doins -r "${WORKDIR}"/install/${PV}/*
-
- # FIX: making all python scripts readable only by group 'users',
- # so nobody can modify scripts apart root user, but python
- # cache (*.pyc) can be written and shared across the users.
-# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-pkg_postinst() {
- echo
- 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
-}
diff --git a/media-gfx/blender/blender-2.63.ebuild b/media-gfx/blender/blender-2.63.ebuild
deleted file mode 100644
index f2a8fb2..0000000
--- a/media-gfx/blender/blender-2.63.ebuild
+++ /dev/null
@@ -1,447 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils ${SCM}
-
-IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
- +dds doc fftw jack apidoc sndfile tweak-mode sdl sse \
- redcode iconv contrib collada 3dmouse"
-
-LANGS="en ar bg ca cs de el es es_ES fa fi fr hr id it ja ky ne pl pt ru ir sr sr@latin sv tr uk zh_CN zh_TW"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
- SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
- media-libs/libpng:0
- x11-libs/libXi
- x11-libs/libX11
- media-libs/tiff:0
- media-libs/libsamplerate
- virtual/opengl
- >=media-libs/freetype-2.0
- virtual/libintl
- media-libs/glew
- >=sci-physics/bullet-2.78[-double-precision]
- dev-cpp/eigen:3
- sci-libs/colamd
- sys-libs/zlib
- cycles? (
- media-libs/openimageio
- dev-libs/boost
- )
- iconv? ( virtual/libiconv )
- sdl? ( media-libs/libsdl[audio,joystick] )
- openexr? ( media-libs/openexr )
- ffmpeg? (
- >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
- )
- openal? ( >=media-libs/openal-1.6.372 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- sndfile? ( media-libs/libsndfile )
- collada? ( media-libs/opencollada )
- 3dmouse? ( dev-libs/libspnav )"
-
-DEPEND="dev-util/scons
- apidoc? (
- dev-python/sphinx
- app-doc/doxygen[-nodot]
- game-engine? ( dev-python/epydoc )
- )
- ${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
- DEPEND="${DEPEND}
- sys-devel/gettext"
-fi
-
-blend_with() {
- local UWORD="$2"
- [ -z "${UWORD}" ] && UWORD="$1"
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
- subversion_fetch
- if use contrib; then
- S="${S}"/release/scripts/addons_contrib subversion_fetch \
- "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
- fi
-else
- unpack ${A}
-fi
-}
-
-pkg_setup() {
- enable_openmp=0
- if use openmp; then
- if tc-has-openmp; then
- enable_openmp=1
- else
- ewarn "You are using gcc built without 'openmp' USE."
- ewarn "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
- fi
- python_set_active_version 3
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
- epatch "${FILESDIR}"/${P}-collada.patch
- epatch "${FILESDIR}"/${P}-doxyfile.patch
-
- # OpenJPEG
- einfo "Removing bundled OpenJPEG ..."
- rm -r extern/libopenjpeg
- epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
- # Glew
- einfo "Removing bundled Glew ..."
- rm -r extern/glew
- epatch "${FILESDIR}"/${P}-glew.patch
-
- # Eigen3
- einfo "Removing bundled Eigen3 ..."
- rm -r extern/Eigen3
- epatch "${FILESDIR}"/${P}-eigen.patch
-
- # Bullet2
- einfo "Removing bundled Bullet2 ..."
- rm -r extern/bullet2
- epatch "${FILESDIR}"/${P}-bullet.patch
-
- # Colamd
- einfo "Removing bundled Colamd ..."
- rm -r extern/colamd
- epatch "${FILESDIR}"/${P}-colamd.patch
-
- ewarn "$(echo "Remaining bundled dependencies:";
- find extern -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
-
- # Linux 3.x (bug #381099)
- epatch "${FILESDIR}"/${PN}-${SLOT}-linux-3.patch
-
- epatch "${FILESDIR}"/${PN}-${SLOT}-libav-0.7.patch
- epatch "${FILESDIR}"/${P}-CVE-2009-3850-v5.patch
- epatch "${FILESDIR}"/${P}-enable_site_module.patch
- epatch "${FILESDIR}"/${P}-opencollada-debug.patch
-}
-
-src_configure() {
- # add system openjpeg into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG="/usr"
- BF_OPENJPEG_INC="/usr/include"
- BF_OPENJPEG_LIB="openjpeg"
- EOF
-
- # add system sci-physic/bullet into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_BULLET=1
- BF_BULLET="/usr/include"
- BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
- BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
- EOF
-
- # add system sci-libs/colamd into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_COLAMD=1
- BF_COLAMD="/usr"
- BF_COLAMD_INC="/usr/include"
- BF_COLAMD_LIB="colamd"
- EOF
-
- #add iconv into Scons build options.
- if use !elibc_glibc && use !elibc_uclibc && use iconv; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_ICONV=1
- BF_ICONV="/usr"
- EOF
- fi
-
- # configure internationalization only if LINGUAS have more
- # languages than 'en', otherwise must be disabled
- [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
- # Ocean sim system needs fftw
- use fftw || echo "WITH_BF_OCEANSIM=0" >> "${S}"/user-config.py
-
- # configure Tweak Mode
- use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
- # FIX: Game Engine module needs to be active to build the Blender Player
- if ! use game-engine && use player; then
- elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
- echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
- else
- blend_with game-engine gameengine
- fi
-
- # set CFLAGS used in /etc/make.conf correctly
- echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # set CXXFLAGS used in /etc/make.conf correctly
- local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset general options passed to the C/C++ compilers (useless hardcoded flags)
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
- # set LDFLAGS used in /etc/make.conf correctly
- local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset REL_* variables (useless hardcoded flags)
- cat <<- EOF >> "${S}"/user-config.py
- REL_CFLAGS=[]
- REL_CXXFLAGS=[]
- REL_CCFLAGS=[]
- EOF
-
- # reset warning flags (useless for NON blender developers)
- cat <<- EOF >> "${S}"/user-config.py
- C_WARN =[ '-w', '-g0' ]
- CC_WARN =[ '-w', '-g0' ]
- CXX_WARN=[ '-w', '-g0' ]
- EOF
-
- # detecting -j value from MAKEOPTS
- local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
- [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
- # generic settings which differ from the defaults from linux2-config.py
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
- BF_INSTALLDIR="../install"
- WITH_PYTHON_SECURITY=1
- WITHOUT_BF_PYTHON_INSTALL=1
- BF_PYTHON="/usr"
- BF_PYTHON_VERSION="3.2"
- BF_PYTHON_ABI_FLAGS=""
- BF_BUILDINFO=0
- BF_QUIET=1
- BF_NUMJOBS=${NUMJOBS}
- BF_LINE_OVERWRITE=0
- WITH_BF_FHS=1
- WITH_BF_BINRELOC=0
- WITH_BF_STATICOPENGL=0
- WITH_BF_OPENMP=${enable_openmp}
- EOF
-
- # configure WITH_BF* Scons build options
- for arg in \
- 'elbeem fluid' \
- 'sdl' \
- 'apidoc docs' \
- 'jack' \
- 'sndfile' \
- 'openexr' \
- 'dds' \
- 'fftw fftw3' \
- 'jpeg2k openjpeg' \
- 'openal'\
- 'ffmpeg' \
- 'ffmpeg ogg' \
- 'player' \
- 'sse rayoptimization' \
- 'redcode' \
- 'collada' \
- '3dmouse' ; do
- blend_with ${arg}
- done
-
- # add system media-libs/opencollada into Scons build options.
- echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
- echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
-
- # enable debugging/testing support
- is-flag "-g*" && echo "BF_DEBUG=1" >> "${S}"/user-config.py
- #use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-
- # enables Cycles render engine
- if use cycles; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_CYCLES=1
- WITH_BF_OIIO=1
- BF_OIIO="/usr"
- BF_OIIO_INC="/usr/include"
- BF_OIIO_LIB="OpenImageIO"
- WITH_BF_BOOST=1
- BF_BOOST="/usr"
- BF_BOOST_INC="/usr/include/boost"
- EOF
- fi
-
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-}
-
-src_install() {
- # creating binary wrapper
- cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
- #!/bin/sh
-
- # stop this script if the local blender path is a symlink
- if [ -L \${HOME}/.blender ]; then
- echo "Detected a symbolic link for \${HOME}/.blender"
- echo "Sorry, to avoid dangerous situations, the Blender binary can"
- echo "not be started until you have removed the symbolic link:"
- echo " # rm -i \${HOME}/.blender"
- exit 1
- fi
-
- export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts"
- export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles"
- export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV}/plugins"
- exec /usr/bin/blender-bin-${PV} \$*
- EOF
-
- # Pax mark blender for hardened support.
- pax-mark m "${WORKDIR}/install/blender"
-
- # install binaries
- exeinto /usr/bin/
- cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-${PV}"
- if use player; then
- cp "${WORKDIR}/install/blenderplayer" \
- "${WORKDIR}/install/blenderplayer-${PV}"
- doexe "${WORKDIR}/install/blenderplayer-${PV}"
- fi
-
- # install plugin headers
- insinto /usr/include/${PN}/${PV}
- doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
-
- # install contrib scripts addons
- insinto /usr/share/${PN}/${PV}/scripts
- use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
-
- # install desktop file
- insinto /usr/share/pixmaps
- cp release/freedesktop/icons/scalable/apps/blender.svg \
- release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- insinto /usr/share/applications
- cp release/freedesktop/blender.desktop \
- release/freedesktop/blender-${PV}.desktop
- doins release/freedesktop/blender-${PV}.desktop
- newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
-
- # install docs
- doman "${WORKDIR}"/${P}/doc/manpage/blender.1
- use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
- if use apidoc; then
-
- einfo "Generating (BGE) Blender Game Engine API docs ..."
- epydoc source/gameengine/PyDoc/*.py -v \
- -o doc/BGE_API \
- --quiet --quiet --quiet \
- --simple-term \
- --url "http://www.blender.org" \
- --top API_intro \
- --name "Blender GameEngine" \
- --no-private --no-sourcecode \
- --inheritance=included \
- --graph=all \
- --dotpath /usr/bin/dot \
- || die "epydoc failed."
- docinto "API/gameengine"
- dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
- #einfo "Generating (BPY) Blender Python API docs ..."
- "${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py --noaudio || die "blender failed."
- pushd doc/python_api > /dev/null
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- popd > /dev/null
- docinto "API/python"
- dohtml -r doc/python_api/BPY_API/*
-
- einfo "Generating Blender C/C++ API docs ..."
- pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
- docinto "API/blender"
- dohtml -r html/*
- popd > /dev/null
- fi
-
- # final cleanup
- rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
- if [[ -z ${LINGUAS} || ${LINGUAS} == "en" ]]; then
- rm -r "${WORKDIR}/install/${PV}/datafiles/locale"
- else
- for x in "${WORKDIR}"/install/${PV}/datafiles/locale/* ; do
- mylang=${x##*/}
- has ${mylang} ${LINGUAS} || rm -r ${x}
- done
- fi
-
- # installing blender
- insinto /usr/share/${PN}/${PV}
- doins -r "${WORKDIR}"/install/${PV}/*
-
- # FIX: making all python scripts readable only by group 'users',
- # so nobody can modify scripts apart root user, but python
- # cache (*.pyc) can be written and shared across the users.
-# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-pkg_postinst() {
- echo
- 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
-}
diff --git a/media-gfx/blender/blender-2.63a-r1.ebuild b/media-gfx/blender/blender-2.63a-r1.ebuild
deleted file mode 100644
index d457752..0000000
--- a/media-gfx/blender/blender-2.63a-r1.ebuild
+++ /dev/null
@@ -1,445 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils ${SCM}
-
-IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
- +dds doc fftw jack apidoc sndfile tweak-mode sdl sse \
- redcode iconv contrib collada 3dmouse oceansim pax_kernel"
-
-LANGS="en ar bg ca cs de el es es_ES fa fi fr hr id it ja ky ne pl pt ru sr sr@latin sv tr uk zh_CN zh_TW"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
- SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
- media-libs/libpng:0
- x11-libs/libXi
- x11-libs/libX11
- media-libs/tiff:0
- media-libs/libsamplerate
- virtual/opengl
- >=media-libs/freetype-2.0
- virtual/libintl
- media-libs/glew
- >=sci-physics/bullet-2.78[-double-precision]
- dev-cpp/eigen:3
- sci-libs/colamd
- sys-libs/zlib
- cycles? (
- media-libs/openimageio
- dev-libs/boost
- )
- iconv? ( virtual/libiconv )
- sdl? ( media-libs/libsdl[audio,joystick] )
- openexr? ( media-libs/openexr )
- ffmpeg? (
- >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
- )
- openal? ( >=media-libs/openal-1.6.372 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- sndfile? ( media-libs/libsndfile )
- collada? ( media-libs/opencollada )
- 3dmouse? ( dev-libs/libspnav )"
-
-DEPEND="${RDEPEND}
- dev-util/scons
- apidoc? (
- dev-python/sphinx
- app-doc/doxygen[-nodot]
- game-engine? ( dev-python/epydoc )
- )
- pax_kernel? ( sys-apps/paxctl )"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
- DEPEND="${DEPEND}
- sys-devel/gettext"
-fi
-
-blend_with() {
- local UWORD="$2"
- [ -z "${UWORD}" ] && UWORD="$1"
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
- subversion_fetch
- if use contrib; then
- S="${S}"/release/scripts/addons_contrib subversion_fetch \
- "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
- fi
-else
- unpack ${A}
-fi
-}
-
-pkg_setup() {
- enable_openmp=0
- if use openmp; then
- if tc-has-openmp; then
- enable_openmp=1
- else
- ewarn "You are using gcc built without 'openmp' USE."
- ewarn "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
- fi
- python_set_active_version 3
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
- epatch "${FILESDIR}"/${P/a}-collada.patch
- epatch "${FILESDIR}"/${P/a}-doxyfile.patch
-
- # OpenJPEG
- einfo "Removing bundled OpenJPEG ..."
- rm -r extern/libopenjpeg
- epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
- # Glew
- einfo "Removing bundled Glew ..."
- rm -r extern/glew
- epatch "${FILESDIR}"/${P/a}-glew.patch
-
- # Eigen3
- einfo "Removing bundled Eigen3 ..."
- rm -r extern/Eigen3
- epatch "${FILESDIR}"/${P}-eigen.patch
-
- # Bullet2
- einfo "Removing bundled Bullet2 ..."
- rm -r extern/bullet2
- epatch "${FILESDIR}"/${P}-bullet.patch
-
- # Colamd
- einfo "Removing bundled Colamd ..."
- rm -r extern/colamd
- epatch "${FILESDIR}"/${P}-colamd.patch
-
- ewarn "$(echo "Remaining bundled dependencies:";
- find extern -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
-
- epatch "${FILESDIR}"/${PN}-${SLOT}a-libav-0.7.patch
- epatch "${FILESDIR}"/${P/a}-CVE-2009-3850-v5.patch
- epatch "${FILESDIR}"/${P/a}-enable_site_module.patch
- epatch "${FILESDIR}"/${P/a}-opencollada-debug.patch
-}
-
-src_configure() {
- # add system openjpeg into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG="/usr"
- BF_OPENJPEG_INC="/usr/include"
- BF_OPENJPEG_LIB="openjpeg"
- EOF
-
- # add system sci-physic/bullet into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_BULLET=1
- BF_BULLET="/usr/include"
- BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
- BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
- EOF
-
- # add system sci-libs/colamd into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_COLAMD=1
- BF_COLAMD="/usr"
- BF_COLAMD_INC="/usr/include"
- BF_COLAMD_LIB="colamd"
- EOF
-
- #add iconv into Scons build options.
- if use !elibc_glibc && use !elibc_uclibc && use iconv; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_ICONV=1
- BF_ICONV="/usr"
- EOF
- fi
-
- # configure internationalization only if LINGUAS have more
- # languages than 'en', otherwise must be disabled
- [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
- # configure Tweak Mode
- use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
- # FIX: Game Engine module needs to be active to build the Blender Player
- if ! use game-engine && use player; then
- elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
- echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
- else
- blend_with game-engine gameengine
- fi
-
- # set CFLAGS used in /etc/make.conf correctly
- echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # set CXXFLAGS used in /etc/make.conf correctly
- local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset general options passed to the C/C++ compilers (useless hardcoded flags)
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
- # set LDFLAGS used in /etc/make.conf correctly
- local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset REL_* variables (useless hardcoded flags)
- cat <<- EOF >> "${S}"/user-config.py
- REL_CFLAGS=[]
- REL_CXXFLAGS=[]
- REL_CCFLAGS=[]
- EOF
-
- # reset warning flags (useless for NON blender developers)
- cat <<- EOF >> "${S}"/user-config.py
- C_WARN =[ '-w', '-g0' ]
- CC_WARN =[ '-w', '-g0' ]
- CXX_WARN=[ '-w', '-g0' ]
- EOF
-
- # detecting -j value from MAKEOPTS
- local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
- [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
- # generic settings which differ from the defaults from linux2-config.py
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
- BF_INSTALLDIR="../install"
- WITH_PYTHON_SECURITY=1
- WITHOUT_BF_PYTHON_INSTALL=1
- BF_PYTHON="/usr"
- BF_PYTHON_VERSION="3.2"
- BF_PYTHON_ABI_FLAGS=""
- BF_BUILDINFO=0
- BF_QUIET=1
- BF_NUMJOBS=${NUMJOBS}
- BF_LINE_OVERWRITE=0
- WITH_BF_FHS=1
- WITH_BF_BINRELOC=0
- WITH_BF_STATICOPENGL=0
- WITH_BF_OPENMP=${enable_openmp}
- EOF
-
- # configure WITH_BF* Scons build options
- for arg in \
- 'elbeem fluid' \
- 'sdl' \
- 'apidoc docs' \
- 'jack' \
- 'sndfile' \
- 'openexr' \
- 'dds' \
- 'fftw fftw3' \
- 'jpeg2k openjpeg' \
- 'openal'\
- 'ffmpeg' \
- 'ffmpeg ogg' \
- 'player' \
- 'sse rayoptimization' \
- 'redcode' \
- 'collada' \
- '3dmouse' \
- 'oceansim'; do
- blend_with ${arg}
- done
-
- # add system media-libs/opencollada into Scons build options.
- echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
- echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
-
- # enable debugging/testing support
- is-flag "-g*" && echo "BF_DEBUG=1" >> "${S}"/user-config.py
- #use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-
- # enables Cycles render engine
- if use cycles; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_CYCLES=1
- WITH_BF_OIIO=1
- BF_OIIO="/usr"
- BF_OIIO_INC="/usr/include"
- BF_OIIO_LIB="OpenImageIO"
- WITH_BF_BOOST=1
- BF_BOOST="/usr"
- BF_BOOST_INC="/usr/include/boost"
- EOF
- fi
-
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-}
-
-src_install() {
- # creating binary wrapper
- cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
- #!/bin/sh
-
- # stop this script if the local blender path is a symlink
- if [ -L \${HOME}/.blender ]; then
- echo "Detected a symbolic link for \${HOME}/.blender"
- echo "Sorry, to avoid dangerous situations, the Blender binary can"
- echo "not be started until you have removed the symbolic link:"
- echo " # rm -i \${HOME}/.blender"
- exit 1
- fi
-
- export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV/a}/scripts"
- export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV/a}/datafiles"
- export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV/a}/plugins"
- exec /usr/bin/blender-bin-${PV} \$*
- EOF
-
- # Pax mark blender for hardened support.
- use pax_kernel && pax-mark m "${WORKDIR}/install/blender"
-
- # install binaries
- exeinto /usr/bin/
- cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-${PV}"
- if use player; then
- cp "${WORKDIR}/install/blenderplayer" \
- "${WORKDIR}/install/blenderplayer-${PV}"
- doexe "${WORKDIR}/install/blenderplayer-${PV}"
- fi
-
- # install plugin headers
- insinto /usr/include/${PN}/${PV/a}
- doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
-
- # install contrib scripts addons
- if [[ ${PV} == *9999 ]] ; then
- insinto /usr/share/${PN}/${PV/a}/scripts
- use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
- fi
-
- # install desktop file
- insinto /usr/share/pixmaps
- cp release/freedesktop/icons/scalable/apps/blender.svg \
- release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- insinto /usr/share/applications
- cp release/freedesktop/blender.desktop \
- release/freedesktop/blender-${PV}.desktop
- doins release/freedesktop/blender-${PV}.desktop
- newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
-
- # install docs
- doman "${WORKDIR}"/${P}/doc/manpage/blender.1
- use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
- if use apidoc; then
-
- einfo "Generating (BGE) Blender Game Engine API docs ..."
- epydoc source/gameengine/PyDoc/*.py -v \
- -o doc/BGE_API \
- --quiet --quiet --quiet \
- --simple-term \
- --url "http://www.blender.org" \
- --top API_intro \
- --name "Blender GameEngine" \
- --no-private --no-sourcecode \
- --inheritance=included \
- --graph=all \
- --dotpath /usr/bin/dot \
- || die "epydoc failed."
- docinto "API/gameengine"
- dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
- #einfo "Generating (BPY) Blender Python API docs ..."
- "${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py --noaudio || die "blender failed."
- pushd doc/python_api > /dev/null
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- popd > /dev/null
- docinto "API/python"
- dohtml -r doc/python_api/BPY_API/*
-
- einfo "Generating Blender C/C++ API docs ..."
- pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
- docinto "API/blender"
- dohtml -r html/*
- popd > /dev/null
- fi
-
- # final cleanup
- rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
- if [[ -z ${LINGUAS} || ${LINGUAS} == "en" ]]; then
- rm -r "${WORKDIR}/install/${PV/a}/datafiles/locale"
- else
- for x in "${WORKDIR}"/install/${PV/a}/datafiles/locale/* ; do
- mylang=${x##*/}
- has ${mylang} ${LINGUAS} || rm -r ${x}
- done
- fi
-
- # installing blender
- insinto /usr/share/${PN}/${PV/a}
- doins -r "${WORKDIR}"/install/${PV/a}/*
-
- # FIX: making all python scripts readable only by group 'users',
- # so nobody can modify scripts apart root user, but python
- # cache (*.pyc) can be written and shared across the users.
-# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-pkg_postinst() {
- echo
- 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
-}
diff --git a/media-gfx/blender/blender-2.63a.ebuild b/media-gfx/blender/blender-2.63a.ebuild
deleted file mode 100644
index 915f986..0000000
--- a/media-gfx/blender/blender-2.63a.ebuild
+++ /dev/null
@@ -1,446 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $
-
-EAPI=4
-PYTHON_DEPEND="3:3.2"
-
-if [[ ${PV} == *9999 ]] ; then
-SCM="subversion"
-ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-fi
-
-inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils ${SCM}
-
-IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \
- +dds doc fftw jack apidoc sndfile tweak-mode sdl sse \
- redcode iconv contrib collada 3dmouse"
-
-LANGS="en ar bg ca cs de el es es_ES fa fi fr hr id it ja ky ne pl pt ru ir sr sr@latin sv tr uk zh_CN zh_TW"
-for X in ${LANGS} ; do
- IUSE="${IUSE} linguas_${X}"
-done
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org"
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
-else # Official release
- SRC_URI="http://download.blender.org/source/${P}.tar.gz"
-fi
-
-#SLOT="$(get_version_component_range 1-2)"
-SLOT="2.60"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/jpeg
- media-libs/libpng:0
- x11-libs/libXi
- x11-libs/libX11
- media-libs/tiff:0
- media-libs/libsamplerate
- virtual/opengl
- >=media-libs/freetype-2.0
- virtual/libintl
- media-libs/glew
- >=sci-physics/bullet-2.78[-double-precision]
- dev-cpp/eigen:3
- sci-libs/colamd
- sys-libs/zlib
- cycles? (
- media-libs/openimageio
- dev-libs/boost
- )
- iconv? ( virtual/libiconv )
- sdl? ( media-libs/libsdl[audio,joystick] )
- openexr? ( media-libs/openexr )
- ffmpeg? (
- >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora]
- jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] )
- )
- openal? ( >=media-libs/openal-1.6.372 )
- fftw? ( sci-libs/fftw:3.0 )
- jack? ( media-sound/jack-audio-connection-kit )
- sndfile? ( media-libs/libsndfile )
- collada? ( media-libs/opencollada )
- 3dmouse? ( dev-libs/libspnav )"
-
-DEPEND="dev-util/scons
- apidoc? (
- dev-python/sphinx
- app-doc/doxygen[-nodot]
- game-engine? ( dev-python/epydoc )
- )
- ${RDEPEND}"
-
-# configure internationalization only if LINGUAS have more
-# languages than 'en', otherwise must be disabled
-if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then
- DEPEND="${DEPEND}
- sys-devel/gettext"
-fi
-
-blend_with() {
- local UWORD="$2"
- [ -z "${UWORD}" ] && UWORD="$1"
- if use $1; then
- echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- else
- echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \
- >> "${S}"/user-config.py
- fi
-}
-
-src_unpack() {
-if [[ ${PV} == *9999 ]] ; then
- subversion_fetch
- if use contrib; then
- S="${S}"/release/scripts/addons_contrib subversion_fetch \
- "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/"
- fi
-else
- unpack ${A}
-fi
-}
-
-pkg_setup() {
- enable_openmp=0
- if use openmp; then
- if tc-has-openmp; then
- enable_openmp=1
- else
- ewarn "You are using gcc built without 'openmp' USE."
- ewarn "Switch CXX to an OpenMP capable compiler."
- die "Need openmp"
- fi
- fi
- python_set_active_version 3
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-desktop.patch
- epatch "${FILESDIR}"/${P/a}-collada.patch
- epatch "${FILESDIR}"/${P/a}-doxyfile.patch
-
- # OpenJPEG
- einfo "Removing bundled OpenJPEG ..."
- rm -r extern/libopenjpeg
- epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch
-
- # Glew
- einfo "Removing bundled Glew ..."
- rm -r extern/glew
- epatch "${FILESDIR}"/${P/a}-glew.patch
-
- # Eigen3
- einfo "Removing bundled Eigen3 ..."
- rm -r extern/Eigen3
- epatch "${FILESDIR}"/${P}-eigen.patch
-
- # Bullet2
- einfo "Removing bundled Bullet2 ..."
- rm -r extern/bullet2
- epatch "${FILESDIR}"/${P}-bullet.patch
-
- # Colamd
- einfo "Removing bundled Colamd ..."
- rm -r extern/colamd
- epatch "${FILESDIR}"/${P}-colamd.patch
-
- ewarn "$(echo "Remaining bundled dependencies:";
- find extern -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')"
-
- epatch "${FILESDIR}"/${PN}-${SLOT}a-libav-0.7.patch
- epatch "${FILESDIR}"/${P/a}-CVE-2009-3850-v5.patch
- epatch "${FILESDIR}"/${P/a}-enable_site_module.patch
- epatch "${FILESDIR}"/${P/a}-opencollada-debug.patch
-}
-
-src_configure() {
- # add system openjpeg into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENJPEG="/usr"
- BF_OPENJPEG_INC="/usr/include"
- BF_OPENJPEG_LIB="openjpeg"
- EOF
-
- # add system sci-physic/bullet into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_BULLET=1
- BF_BULLET="/usr/include"
- BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody"
- BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath"
- EOF
-
- # add system sci-libs/colamd into Scons build options.
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_COLAMD=1
- BF_COLAMD="/usr"
- BF_COLAMD_INC="/usr/include"
- BF_COLAMD_LIB="colamd"
- EOF
-
- #add iconv into Scons build options.
- if use !elibc_glibc && use !elibc_uclibc && use iconv; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_ICONV=1
- BF_ICONV="/usr"
- EOF
- fi
-
- # configure internationalization only if LINGUAS have more
- # languages than 'en', otherwise must be disabled
- [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py
-
- # Ocean sim system needs fftw
- use fftw || echo "WITH_BF_OCEANSIM=0" >> "${S}"/user-config.py
-
- # configure Tweak Mode
- use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py
-
- # FIX: Game Engine module needs to be active to build the Blender Player
- if ! use game-engine && use player; then
- elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]"
- echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py
- else
- blend_with game-engine gameengine
- fi
-
- # set CFLAGS used in /etc/make.conf correctly
- echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
- | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # set CXXFLAGS used in /etc/make.conf correctly
- local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset general options passed to the C/C++ compilers (useless hardcoded flags)
- # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
- # shadows, see bug #276338 for reference
- echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py
-
- # set LDFLAGS used in /etc/make.conf correctly
- local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`"
- echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
- echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py
-
- # reset REL_* variables (useless hardcoded flags)
- cat <<- EOF >> "${S}"/user-config.py
- REL_CFLAGS=[]
- REL_CXXFLAGS=[]
- REL_CCFLAGS=[]
- EOF
-
- # reset warning flags (useless for NON blender developers)
- cat <<- EOF >> "${S}"/user-config.py
- C_WARN =[ '-w', '-g0' ]
- CC_WARN =[ '-w', '-g0' ]
- CXX_WARN=[ '-w', '-g0' ]
- EOF
-
- # detecting -j value from MAKEOPTS
- local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )"
- [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS
-
- # generic settings which differ from the defaults from linux2-config.py
- cat <<- EOF >> "${S}"/user-config.py
- BF_OPENGL_LIB='GL GLU X11 Xi GLEW'
- BF_INSTALLDIR="../install"
- WITH_PYTHON_SECURITY=1
- WITHOUT_BF_PYTHON_INSTALL=1
- BF_PYTHON="/usr"
- BF_PYTHON_VERSION="3.2"
- BF_PYTHON_ABI_FLAGS=""
- BF_BUILDINFO=0
- BF_QUIET=1
- BF_NUMJOBS=${NUMJOBS}
- BF_LINE_OVERWRITE=0
- WITH_BF_FHS=1
- WITH_BF_BINRELOC=0
- WITH_BF_STATICOPENGL=0
- WITH_BF_OPENMP=${enable_openmp}
- EOF
-
- # configure WITH_BF* Scons build options
- for arg in \
- 'elbeem fluid' \
- 'sdl' \
- 'apidoc docs' \
- 'jack' \
- 'sndfile' \
- 'openexr' \
- 'dds' \
- 'fftw fftw3' \
- 'jpeg2k openjpeg' \
- 'openal'\
- 'ffmpeg' \
- 'ffmpeg ogg' \
- 'player' \
- 'sse rayoptimization' \
- 'redcode' \
- 'collada' \
- '3dmouse' ; do
- blend_with ${arg}
- done
-
- # add system media-libs/opencollada into Scons build options.
- echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py
- echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py
-
- # enable debugging/testing support
- is-flag "-g*" && echo "BF_DEBUG=1" >> "${S}"/user-config.py
- #use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py
-
- # enables Cycles render engine
- if use cycles; then
- cat <<- EOF >> "${S}"/user-config.py
- WITH_BF_CYCLES=1
- WITH_BF_OIIO=1
- BF_OIIO="/usr"
- BF_OIIO_INC="/usr/include"
- BF_OIIO_LIB="OpenImageIO"
- WITH_BF_BOOST=1
- BF_BOOST="/usr"
- BF_BOOST_INC="/usr/include/boost"
- EOF
- fi
-
-}
-
-src_compile() {
- escons || die \
- '!!! Please add "${S}/scons.config" when filing bugs reports \
- to bugs.gentoo.org'
-}
-
-src_install() {
- # creating binary wrapper
- cat <<- EOF >> "${WORKDIR}/install/blender-${PV}"
- #!/bin/sh
-
- # stop this script if the local blender path is a symlink
- if [ -L \${HOME}/.blender ]; then
- echo "Detected a symbolic link for \${HOME}/.blender"
- echo "Sorry, to avoid dangerous situations, the Blender binary can"
- echo "not be started until you have removed the symbolic link:"
- echo " # rm -i \${HOME}/.blender"
- exit 1
- fi
-
- export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV/a}/scripts"
- export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV/a}/datafiles"
- export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV/a}/plugins"
- exec /usr/bin/blender-bin-${PV} \$*
- EOF
-
- # Pax mark blender for hardened support.
- pax-mark m "${WORKDIR}/install/blender"
-
- # install binaries
- exeinto /usr/bin/
- cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-bin-${PV}"
- doexe "${WORKDIR}/install/blender-${PV}"
- if use player; then
- cp "${WORKDIR}/install/blenderplayer" \
- "${WORKDIR}/install/blenderplayer-${PV}"
- doexe "${WORKDIR}/install/blenderplayer-${PV}"
- fi
-
- # install plugin headers
- insinto /usr/include/${PN}/${PV/a}
- doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h
-
- # install contrib scripts addons
- if [[ ${PV} == *9999 ]] ; then
- insinto /usr/share/${PN}/${PV/a}/scripts
- use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib
- fi
-
- # install desktop file
- insinto /usr/share/pixmaps
- cp release/freedesktop/icons/scalable/apps/blender.svg \
- release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg
- insinto /usr/share/applications
- cp release/freedesktop/blender.desktop \
- release/freedesktop/blender-${PV}.desktop
- doins release/freedesktop/blender-${PV}.desktop
- newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop
-
- # install docs
- doman "${WORKDIR}"/${P}/doc/manpage/blender.1
- use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/*
- if use apidoc; then
-
- einfo "Generating (BGE) Blender Game Engine API docs ..."
- epydoc source/gameengine/PyDoc/*.py -v \
- -o doc/BGE_API \
- --quiet --quiet --quiet \
- --simple-term \
- --url "http://www.blender.org" \
- --top API_intro \
- --name "Blender GameEngine" \
- --no-private --no-sourcecode \
- --inheritance=included \
- --graph=all \
- --dotpath /usr/bin/dot \
- || die "epydoc failed."
- docinto "API/gameengine"
- dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/*
-
- #einfo "Generating (BPY) Blender Python API docs ..."
- "${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py --noaudio || die "blender failed."
- pushd doc/python_api > /dev/null
- sphinx-build sphinx-in BPY_API || die "sphinx failed."
- popd > /dev/null
- docinto "API/python"
- dohtml -r doc/python_api/BPY_API/*
-
- einfo "Generating Blender C/C++ API docs ..."
- pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null
- doxygen -u Doxyfile
- doxygen || die "doxygen failed to build API docs."
- docinto "API/blender"
- dohtml -r html/*
- popd > /dev/null
- fi
-
- # final cleanup
- rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt}
- if [[ -z ${LINGUAS} || ${LINGUAS} == "en" ]]; then
- rm -r "${WORKDIR}/install/${PV/a}/datafiles/locale"
- else
- for x in "${WORKDIR}"/install/${PV/a}/datafiles/locale/* ; do
- mylang=${x##*/}
- has ${mylang} ${LINGUAS} || rm -r ${x}
- done
- fi
-
- # installing blender
- insinto /usr/share/${PN}/${PV/a}
- doins -r "${WORKDIR}"/install/${PV/a}/*
-
- # FIX: making all python scripts readable only by group 'users',
- # so nobody can modify scripts apart root user, but python
- # cache (*.pyc) can be written and shared across the users.
-# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die
-}
-
-pkg_postinst() {
- echo
- 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
-}
diff --git a/media-gfx/blender/files/blender-2.60-bmake.patch b/media-gfx/blender/files/blender-2.60-bmake.patch
deleted file mode 100644
index 0ce8fa7..0000000
--- a/media-gfx/blender/files/blender-2.60-bmake.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -Npur release/plugins.orig/bmake release/plugins/bmake
---- release/plugins.orig/bmake 2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/bmake 2011-11-11 15:01:40.637923565 +0100
-@@ -57,10 +57,10 @@
- LDFLAGS="-Bshareable";
- elif ( test $UNAME = "Linux" ) then
- CC="gcc";
-- CFLAGS="-fPIC -funsigned-char -O2";
-+# CFLAGS="-fPIC -funsigned-char -O2";
-
- LD="ld";
-- LDFLAGS="-Bshareable";
-+# LDFLAGS="-Bshareable";
- elif ( test $UNAME = "SunOS" ) then
- CC="cc";
- CFLAGS="-O";
-@@ -109,22 +109,20 @@ elif ( test -f "../plugin.h" ) then
- INCLUDES=-I..;
- elif ( test -f "../include/plugin.h" ) then
- INCLUDES=-I../include
-+elif ( test -f "../../../source/blender/blenpluginapi/plugin.h" ) then
-+ INCLUDES=-I../../../source/blender/blenpluginapi
- else
- echo "Couldn't find plugin.h";
- exit;
- fi
-
- LIBM=`fgrep "#include <math.h>" $CFILE`
--LIBC=`fgrep "#include <std" $CFILE`
-
--LIBS=
-+LIBS="-lc"
-
- if ( test -n "$LIBM" ) then
- LIBS="$LIBS -lm";
- fi
--if ( test -n "$LIBC" ) then
-- LIBS="$LIBS -lc";
--fi
-
- echo "$CC $CFLAGS -c $CFILE $INCLUDES"
- $CC $CFLAGS -c $CFILE $INCLUDES
-diff -Npur release/plugins.orig/sequence/color-correction-hsv.c release/plugins/sequence/color-correction-hsv.c
---- release/plugins.orig/sequence/color-correction-hsv.c 2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/sequence/color-correction-hsv.c 2011-11-11 15:03:47.233921332 +0100
-@@ -15,7 +15,7 @@
- *
- */
-
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- #include <stdio.h>
-
-diff -Npur release/plugins.orig/sequence/color-correction-yuv.c release/plugins/sequence/color-correction-yuv.c
---- release/plugins.orig/sequence/color-correction-yuv.c 2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/sequence/color-correction-yuv.c 2011-11-11 15:02:10.446923031 +0100
-@@ -15,7 +15,7 @@
- *
- */
-
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- #include <stdio.h>
-
-diff -Npur release/plugins.orig/sequence/dnr.c release/plugins/sequence/dnr.c
---- release/plugins.orig/sequence/dnr.c 2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/sequence/dnr.c 2011-11-11 15:03:30.049921648 +0100
-@@ -15,7 +15,7 @@
- *
- */
-
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- #include <stdio.h>
-
-diff -Npur release/plugins.orig/sequence/gamma.c release/plugins/sequence/gamma.c
---- release/plugins.orig/sequence/gamma.c 2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/sequence/gamma.c 2011-11-11 15:01:58.982923268 +0100
-@@ -15,7 +15,7 @@
- *
- */
-
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
- #include "util.h"
- #include <stdio.h>
-diff -Npur release/plugins.orig/texture/clouds2.c release/plugins/texture/clouds2.c
---- release/plugins.orig/texture/clouds2.c 2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/texture/clouds2.c 2011-11-11 15:02:23.104922789 +0100
-@@ -27,7 +27,7 @@
- * ***** END GPL LICENSE BLOCK *****
- */
-
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
-
- /* ******************** GLOBAL VARIABLES ***************** */
-diff -Npur release/plugins.orig/texture/tiles.c release/plugins/texture/tiles.c
---- release/plugins.orig/texture/tiles.c 2011-11-11 15:00:26.339924887 +0100
-+++ release/plugins/texture/tiles.c 2011-11-11 15:04:05.749921038 +0100
-@@ -27,7 +27,7 @@
- * ***** END GPL LICENSE BLOCK *****
- */
-
--#include "math.h"
-+#include <math.h>
- #include "plugin.h"
-
- /* ******************** GLOBAL VARIABLES ***************** */
diff --git a/media-gfx/blender/files/blender-2.60-bullet.patch b/media-gfx/blender/files/blender-2.60-bullet.patch
deleted file mode 100644
index 05e47fb..0000000
--- a/media-gfx/blender/files/blender-2.60-bullet.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-diff -Npur blender-2.61.orig/build_files/scons/tools/Blender.py blender-2.61/build_files/scons/tools/Blender.py
---- blender-2.61.orig/build_files/scons/tools/Blender.py 2011-12-20 22:36:19.299620183 +0100
-+++ blender-2.61/build_files/scons/tools/Blender.py 2011-12-20 22:36:50.517619833 +0100
-@@ -270,6 +270,8 @@ def setup_syslibs(lenv):
- syslibs += Split(lenv['BF_SDL_LIB'])
- if not lenv['WITH_BF_STATICOPENGL']:
- syslibs += Split(lenv['BF_OPENGL_LIB'])
-+ if lenv['WITH_BF_BULLET']:
-+ syslibs += Split(lenv['BF_BULLET_LIB'])
- if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross', 'win64-vc'):
- syslibs += Split(lenv['BF_PTHREADS_LIB'])
- if lenv['WITH_BF_COLLADA']:
-diff -Npur blender-2.61.orig/doc/doxygen/Doxyfile blender-2.61/doc/doxygen/Doxyfile
---- blender-2.61.orig/doc/doxygen/Doxyfile 2011-12-20 22:36:19.254620184 +0100
-+++ blender-2.61/doc/doxygen/Doxyfile 2011-12-20 22:36:50.544619631 +0100
-@@ -617,8 +617,7 @@ INPUT = doxygen.main \
- doxygen.intern \
- doxygen.extern \
- ../../source \
-- ../../intern \
-- ../../extern/bullet2
-+ ../../intern
-
- # This tag can be used to specify the character encoding of the source files
- # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-diff -Npur blender-2.61.orig/extern/CMakeLists.txt blender-2.61/extern/CMakeLists.txt
---- blender-2.61.orig/extern/CMakeLists.txt 2011-12-20 22:36:19.296620183 +0100
-+++ blender-2.61/extern/CMakeLists.txt 2011-12-20 22:36:50.544619631 +0100
-@@ -28,10 +28,6 @@ remove_strict_flags()
-
- add_subdirectory(colamd)
-
--if(WITH_BULLET)
-- add_subdirectory(bullet2)
--endif()
--
- if(WITH_MOD_CLOTH_ELTOPO)
- add_subdirectory(eltopo)
- endif()
-diff -Npur blender-2.61.orig/extern/SConscript blender-2.61/extern/SConscript
---- blender-2.61.orig/extern/SConscript 2011-12-20 22:36:19.295620183 +0100
-+++ blender-2.61/extern/SConscript 2011-12-20 22:36:50.544619631 +0100
-@@ -10,9 +10,6 @@ if env['WITH_BF_GAMEENGINE']:
- if env['WITH_BF_ELTOPO']:
- SConscript(['eltopo/SConscript'])
-
--if env['WITH_BF_BULLET']:
-- SConscript(['bullet2/src/SConscript'])
--
- if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '':
- SConscript(['libredcode/SConscript'])
-
-diff -Npur blender-2.61.orig/intern/smoke/CMakeLists.txt blender-2.61/intern/smoke/CMakeLists.txt
---- blender-2.61.orig/intern/smoke/CMakeLists.txt 2011-12-20 22:36:19.501620180 +0100
-+++ blender-2.61/intern/smoke/CMakeLists.txt 2011-12-20 22:36:50.544619631 +0100
-@@ -26,10 +26,10 @@
- set(INC
- intern
- ../memutil
-- ../../extern/bullet2/src
- )
-
- set(INC_SYS
-+ /usr/include/bullet2
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
- )
-diff -Npur blender-2.61.orig/intern/smoke/SConscript blender-2.61/intern/smoke/SConscript
---- blender-2.61.orig/intern/smoke/SConscript 2011-12-20 22:36:19.501620180 +0100
-+++ blender-2.61/intern/smoke/SConscript 2011-12-20 22:36:50.545619631 +0100
-@@ -13,7 +13,7 @@ if env['WITH_BF_OPENMP']:
- defs += ' PARALLEL=1'
-
- incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC']
--incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc '
-+incs += ' intern /usr/include/bullet ../memutil ../guardealloc '
-
- if env['WITH_BF_FFTW3']:
- defs += ' WITH_FFTW3'
-diff -Npur blender-2.61.orig/source/blender/blenkernel/CMakeLists.txt blender-2.61/source/blender/blenkernel/CMakeLists.txt
---- blender-2.61.orig/source/blender/blenkernel/CMakeLists.txt 2011-12-20 22:36:19.325620183 +0100
-+++ blender-2.61/source/blender/blenkernel/CMakeLists.txt 2011-12-20 22:36:50.545619631 +0100
-@@ -253,8 +253,8 @@ if(WITH_AUDASPACE)
- endif()
-
- if(WITH_BULLET)
-- list(APPEND INC
-- ../../../extern/bullet2/src
-+ list(APPEND INC_SYS
-+ /usr/include/bullet
- )
- add_definitions(-DUSE_BULLET)
- endif()
-diff -Npur blender-2.61.orig/source/blender/blenkernel/SConscript blender-2.61/source/blender/blenkernel/SConscript
---- blender-2.61.orig/source/blender/blenkernel/SConscript 2011-12-20 22:36:19.325620183 +0100
-+++ blender-2.61/source/blender/blenkernel/SConscript 2011-12-20 22:36:50.545619631 +0100
-@@ -9,7 +9,7 @@ incs += ' ../blenlib ../blenfont ../make
- incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna'
- incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers'
- incs += ' #/intern/iksolver/extern ../blenloader'
--incs += ' #/extern/bullet2/src'
-+incs += ' /usr/include/bullet'
- incs += ' #/intern/opennl/extern #/intern/bsp/extern'
- incs += ' ../gpu #/extern/glew/include'
- incs += ' #/intern/smoke/extern'
-diff -Npur blender-2.61.orig/source/gameengine/BlenderRoutines/CMakeLists.txt blender-2.61/source/gameengine/BlenderRoutines/CMakeLists.txt
---- blender-2.61.orig/source/gameengine/BlenderRoutines/CMakeLists.txt 2011-12-20 22:36:19.307620183 +0100
-+++ blender-2.61/source/gameengine/BlenderRoutines/CMakeLists.txt 2011-12-20 22:36:50.545619631 +0100
-@@ -23,7 +23,6 @@ set(INC
- ../../blender/makesdna
- ../../blender/makesrna
- ../../blender/windowmanager
-- ../../../extern/bullet2/src
- ../../../intern/container
- ../../../intern/guardedalloc
- ../../../intern/moto/include
-@@ -32,7 +31,7 @@ set(INC
- )
-
- set(INC_SYS
--
-+ /usr/include/bullet
- )
-
- set(SRC
-diff -Npur blender-2.61.orig/source/gameengine/Converter/CMakeLists.txt blender-2.61/source/gameengine/Converter/CMakeLists.txt
---- blender-2.61.orig/source/gameengine/Converter/CMakeLists.txt 2011-12-20 22:36:19.311620183 +0100
-+++ blender-2.61/source/gameengine/Converter/CMakeLists.txt 2011-12-20 22:36:50.545619631 +0100
-@@ -49,7 +49,6 @@ set(INC
- ../../blender/makesdna
- ../../blender/makesrna
- ../../blender/windowmanager
-- ../../../extern/bullet2/src
- ../../../intern/container
- ../../../intern/guardedalloc
- ../../../intern/moto/include
-@@ -59,6 +58,7 @@ set(INC
-
- set(INC_SYS
- /usr/include/eigen3
-+ /usr/include/bullet
- )
-
- set(SRC
-diff -Npur blender-2.61.orig/source/gameengine/Ketsji/CMakeLists.txt blender-2.61/source/gameengine/Ketsji/CMakeLists.txt
---- blender-2.61.orig/source/gameengine/Ketsji/CMakeLists.txt 2011-12-20 22:36:19.317620183 +0100
-+++ blender-2.61/source/gameengine/Ketsji/CMakeLists.txt 2011-12-20 22:36:50.545619631 +0100
-@@ -241,9 +241,11 @@ endif()
-
- if(WITH_BULLET)
- list(APPEND INC
-- ../../../extern/bullet2/src
- ../Physics/Bullet
- )
-+ list(APPEND INC_SYS
-+ /usr/include/bullet
-+ )
- add_definitions(-DUSE_BULLET)
- endif()
-
-diff -Npur blender-2.61.orig/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp blender-2.61/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
---- blender-2.61.orig/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2011-12-20 22:36:19.306620183 +0100
-+++ blender-2.61/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2011-12-20 22:37:37.479618806 +0100
-@@ -2804,7 +2804,8 @@ float CcdPhysicsEnvironment::getApplied
-
- void CcdPhysicsEnvironment::exportFile(const char* filename)
- {
-- btDefaultSerializer* serializer = new btDefaultSerializer();
-+ // Workaround bullet-2.77 api change.
-+ btDefaultSerializer* serializer = new btDefaultSerializer(0);
-
-
- for (int i=0;i<m_dynamicsWorld->getNumCollisionObjects();i++)
-diff -Npur blender-2.61.orig/source/gameengine/Physics/Bullet/CMakeLists.txt blender-2.61/source/gameengine/Physics/Bullet/CMakeLists.txt
---- blender-2.61.orig/source/gameengine/Physics/Bullet/CMakeLists.txt 2011-12-20 22:36:19.306620183 +0100
-+++ blender-2.61/source/gameengine/Physics/Bullet/CMakeLists.txt 2011-12-20 22:36:50.545619631 +0100
-@@ -37,7 +37,6 @@ set(INC
- ../../../blender/blenkernel
- ../../../blender/blenlib
- ../../../blender/makesdna
-- ../../../../extern/bullet2/src
- ../../../../intern/container
- ../../../../intern/guardedalloc
- ../../../../intern/moto/include
-@@ -45,6 +44,7 @@ set(INC
- )
-
- set(INC_SYS
-+ /usr/include/bullet
- ${GLEW_INCLUDE_PATH}
- ${PYTHON_INCLUDE_DIRS}
- )
diff --git a/media-gfx/blender/files/blender-2.60-colamd.patch b/media-gfx/blender/files/blender-2.60-colamd.patch
deleted file mode 100644
index 8afb5cb..0000000
--- a/media-gfx/blender/files/blender-2.60-colamd.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-diff -Npur blender-2.61.orig/build_files/scons/config/linux-config.py blender-2.61/build_files/scons/config/linux-config.py
---- blender-2.61.orig/build_files/scons/config/linux-config.py 2012-01-22 00:59:55.201475928 +0100
-+++ blender-2.61/build_files/scons/config/linux-config.py 2012-01-22 01:00:24.211475415 +0100
-@@ -189,6 +189,11 @@ BF_EXPAT = '/usr'
- BF_EXPAT_LIB = 'expat'
- BF_EXPAT_LIBPATH = '/usr/lib'
-
-+WITH_BF_COLAMD = True
-+BF_COLAMD = '#extern/colamd'
-+BF_COLAMD_INC = '${BF_COLAMD}/include'
-+BF_COLAMD_LIB = 'extern_colamd'
-+
- WITH_BF_JEMALLOC = False
- WITH_BF_STATICJEMALLOC = False
- BF_JEMALLOC = '/usr'
-diff -Npur blender-2.61.orig/build_files/scons/tools/Blender.py blender-2.61/build_files/scons/tools/Blender.py
---- blender-2.61.orig/build_files/scons/tools/Blender.py 2012-01-22 00:59:55.201475928 +0100
-+++ blender-2.61/build_files/scons/tools/Blender.py 2012-01-22 01:00:24.193475419 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+
-
- """
- tools.BlenderEnvironment
-@@ -281,6 +281,8 @@ def setup_syslibs(lenv):
- else:
- syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
- syslibs.append(lenv['BF_EXPAT_LIB'])
-+ if lenv['WITH_BF_COLAMD']:
-+ syslibs += Split(lenv['BF_COLAMD_LIB'])
-
- if lenv['WITH_BF_JEMALLOC']:
- if not lenv['WITH_BF_STATICJEMALLOC']:
-diff -Npur blender-2.61.orig/build_files/scons/tools/btools.py blender-2.61/build_files/scons/tools/btools.py
---- blender-2.61.orig/build_files/scons/tools/btools.py 2012-01-22 00:59:55.201475928 +0100
-+++ blender-2.61/build_files/scons/tools/btools.py 2012-01-22 01:01:11.974474571 +0100
-@@ -125,6 +125,7 @@ def validate_arguments(args, bc):
- 'WITH_BF_FFTW3', 'BF_FFTW3', 'BF_FFTW3_INC', 'BF_FFTW3_LIB', 'BF_FFTW3_LIBPATH', 'WITH_BF_STATICFFTW3', 'BF_FFTW3_LIB_STATIC',
- 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC',
- 'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_INC', 'BF_OPENCOLLADA_LIB', 'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH', 'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH',
-+ 'WITH_BF_COLAMD', 'BF_COLAMD', 'BF_COLAMD_INC', 'BF_COLAMD_LIB',
- 'WITH_BF_PLAYER',
- 'WITH_BF_NOBLENDER',
- 'WITH_BF_BINRELOC',
-@@ -447,6 +448,11 @@ def read_opts(env, cfg, args):
- ('BF_EXPAT_LIB', 'Expat library', ''),
- ('BF_EXPAT_LIBPATH', 'Expat library path', ''),
-
-+ (BoolVariable('WITH_BF_COLAMD', 'Use Colamd if true', True)),
-+ ('BF_COLAMD', 'Colamd base dir', ''),
-+ ('BF_COLAMD_INC', 'Colamd include path', ''),
-+ ('BF_COLAMD_LIB', 'Colamd library', ''),
-+
- (BoolVariable('WITH_BF_JEMALLOC', 'Use jemalloc if true', False)),
- (BoolVariable('WITH_BF_STATICJEMALLOC', 'Staticly link to jemalloc', False)),
- ('BF_JEMALLOC', 'jemalloc base path', ''),
-diff -Npur blender-2.61.orig/extern/CMakeLists.txt blender-2.61/extern/CMakeLists.txt
---- blender-2.61.orig/extern/CMakeLists.txt 2012-01-22 00:59:55.198475928 +0100
-+++ blender-2.61/extern/CMakeLists.txt 2012-01-22 01:00:24.193475419 +0100
-@@ -26,8 +26,6 @@
- # Otherwise we get warnings here that we cant fix in external projects
- remove_strict_flags()
-
--add_subdirectory(colamd)
--
- if(WITH_MOD_CLOTH_ELTOPO)
- add_subdirectory(eltopo)
- endif()
-diff -Npur blender-2.61.orig/extern/libmv/bundle.sh blender-2.61/extern/libmv/bundle.sh
---- blender-2.61.orig/extern/libmv/bundle.sh 2012-01-22 00:59:55.194475928 +0100
-+++ blender-2.61/extern/libmv/bundle.sh 2012-01-22 01:00:24.194475416 +0100
-@@ -118,13 +118,13 @@ set(INC
- .
- ./third_party/ssba
- ./third_party/ldl/Include
-- ../colamd/Include
- )
-
- set(INC_SYS
- /usr/include/eigen3
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
-+ ${COLAMD_INCULDE_DIRS}
- )
-
- set(SRC
-@@ -227,6 +227,7 @@ $src
- incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-+incs += ' ' + env['BF_COLAMD_INC']
-
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
-@@ -257,7 +258,7 @@ else:
- ccflags_libmv = Split(env['REL_CCFLAGS'])
- cxxflags_libmv = Split(env['REL_CXXFLAGS'])
-
--incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
-+incs += ' ./third_party/ssba ./third_party/ldl/Include'
-
- env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
- EOF
-diff -Npur blender-2.61.orig/extern/libmv/CMakeLists.txt blender-2.61/extern/libmv/CMakeLists.txt
---- blender-2.61.orig/extern/libmv/CMakeLists.txt 2012-01-22 00:59:55.190475928 +0100
-+++ blender-2.61/extern/libmv/CMakeLists.txt 2012-01-22 01:00:24.209475415 +0100
-@@ -26,13 +26,13 @@ set(INC
- .
- third_party/ssba
- third_party/ldl/Include
-- ../colamd/Include
- )
-
- set(INC_SYS
- /usr/include/eigen3
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
-+ ${COLAMD_INCLUDE_DIRS}
- )
-
- set(SRC
-diff -Npur blender-2.61.orig/extern/libmv/SConscript blender-2.61/extern/libmv/SConscript
---- blender-2.61.orig/extern/libmv/SConscript 2012-01-22 00:59:55.190475928 +0100
-+++ blender-2.61/extern/libmv/SConscript 2012-01-22 01:00:24.210475415 +0100
-@@ -28,6 +28,7 @@ src += env.Glob('third_party/ssba/Math/*
- incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-+incs += ' ' + env['BF_COLAMD_INC']
-
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
-@@ -57,6 +58,6 @@ else:
- ccflags_libmv += Split(env['REL_CCFLAGS'])
- cxxflags_libmv += Split(env['REL_CXXFLAGS'])
-
--incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
-+incs += ' ./third_party/ssba ./third_party/ldl/Include'
-
- env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
-diff -Npur blender-2.61.orig/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp blender-2.61/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
---- blender-2.61.orig/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-01-22 00:59:55.191475928 +0100
-+++ blender-2.61/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-01-22 01:00:24.210475415 +0100
-@@ -21,7 +21,7 @@ with SSBA. If not, see <http://www.gnu.o
-
- #if defined(V3DLIB_ENABLE_SUITESPARSE)
- //# include "COLAMD/Include/colamd.h"
--# include "colamd.h"
-+# include <colamd.h>
- extern "C"
- {
- //# include "LDL/Include/ldl.h"
-diff -Npur blender-2.61.orig/extern/SConscript blender-2.61/extern/SConscript
---- blender-2.61.orig/extern/SConscript 2012-01-22 00:59:55.197475928 +0100
-+++ blender-2.61/extern/SConscript 2012-01-22 01:00:24.210475415 +0100
-@@ -2,8 +2,6 @@
-
- Import('env')
-
--SConscript(['colamd/SConscript'])
--
- if env['WITH_BF_GAMEENGINE']:
- SConscript(['recastnavigation/SConscript'])
-
-diff -Npur blender-2.61.orig/intern/opennl/CMakeLists.txt blender-2.61/intern/opennl/CMakeLists.txt
---- blender-2.61.orig/intern/opennl/CMakeLists.txt 2012-01-22 00:59:55.482475922 +0100
-+++ blender-2.61/intern/opennl/CMakeLists.txt 2012-01-22 01:00:24.210475415 +0100
-@@ -40,11 +40,10 @@ add_definitions(
- set(INC
- extern
- superlu
-- ../../extern/colamd/Include
- )
-
- set(INC_SYS
--
-+ /usr/include
- )
-
- set(SRC
-diff -Npur blender-2.61.orig/intern/opennl/SConscript blender-2.61/intern/opennl/SConscript
---- blender-2.61.orig/intern/opennl/SConscript 2012-01-22 00:59:55.482475922 +0100
-+++ blender-2.61/intern/opennl/SConscript 2012-01-22 01:00:24.210475415 +0100
-@@ -3,7 +3,7 @@ Import ('env')
-
- sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c')
-
--incs = 'extern superlu ../../extern/colamd/Include'
-+incs = 'extern superlu /usr/include'
-
- if (env['OURPLATFORM'] == 'win32-mingw'):
- env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
-diff -Npur blender-2.61.orig/intern/opennl/superlu/get_perm_c.c blender-2.61/intern/opennl/superlu/get_perm_c.c
---- blender-2.61.orig/intern/opennl/superlu/get_perm_c.c 2012-01-22 00:59:55.482475922 +0100
-+++ blender-2.61/intern/opennl/superlu/get_perm_c.c 2012-01-22 01:00:24.210475415 +0100
-@@ -10,7 +10,7 @@
- */
-
- #include "ssp_defs.h"
--#include "colamd.h"
-+#include <colamd.h>
-
- extern int genmmd_(int *, int *, int *, int *, int *, int *, int *,
- int *, int *, int *, int *, int *);
diff --git a/media-gfx/blender/files/blender-2.60-doxyfile.patch b/media-gfx/blender/files/blender-2.60-doxyfile.patch
deleted file mode 100644
index aa61c55..0000000
--- a/media-gfx/blender/files/blender-2.60-doxyfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- blender-2.58a/doc/doxygen/Doxyfile 2011-07-11 23:27:33.975642545 -0300
-+++ blender-2.58a/doc/doxygen/Doxyfile 2011-07-11 23:28:54.913642574 -0300
-@@ -42,7 +42,7 @@
- # exceed 55 pixels and the maximum width should not exceed 200 pixels.
- # Doxygen will copy the logo to the output directory.
-
--PROJECT_LOGO = ../../release/freedesktop/icons/48x48/blender.png
-+PROJECT_LOGO = ../../release/freedesktop/icons/48x48/apps/blender.png
-
- # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
- # base path where the generated documentation will be put.
diff --git a/media-gfx/blender/files/blender-2.60-eigen.patch b/media-gfx/blender/files/blender-2.60-eigen.patch
deleted file mode 100644
index 6955ee1..0000000
--- a/media-gfx/blender/files/blender-2.60-eigen.patch
+++ /dev/null
@@ -1,293 +0,0 @@
---- intern/itasc/SConscript 2009-09-26 09:14:02.000000000 +0200
-+++ intern/itasc/SConscript 2009-09-26 09:14:54.000000000 +0200
-@@ -5,7 +5,8 @@
- sources += env.Glob('kdl/*.cpp')
- sources += env.Glob('kdl/utilities/*.cpp')
-
--incs = '. ../../extern/Eigen2'
-+#incs = '. ../../extern/Eigen2'
-+incs = '. /usr/include/eigen2'
-
- env.BlenderLib ('bf_intern_itasc', sources, Split(incs), [], libtype=['intern','player'], priority=[20,100] )
-
---- source/blender/ikplugin/SConscript
-+++ source/blender/ikplugin/SConscript
-@@ -4,6 +4,6 @@
- sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
-
- incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
--incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen2'
-+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen2'
-
- env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), [], libtype=['core','player'], priority=[180, 190] )
---- source/gameengine/Converter/SConscript 2009-09-26 09:14:02.000000000 +0200
-+++ source/gameengine/Converter/SConscript 2009-09-26 09:14:54.000000000 +0200
-@@ -21,7 +21,8 @@
- incs += ' #source/blender/makesrna'
- incs += ' #source/blender/ikplugin'
- incs += ' #extern/recastnavigation/Detour/Include'
--incs += ' #extern/Eigen2'
-+#incs += ' #extern/Eigen2'
-+incs += ' /usr/include/eigen2'
-
- incs += ' ' + env['BF_BULLET_INC']
-
---- intern/itasc/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100
-+++ intern/itasc/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100
-@@ -25,11 +25,11 @@
- # ***** END GPL LICENSE BLOCK *****
-
- set(INC
-- ../../extern/Eigen2
-+ /usr/include/eigen2
- )
-
- set(INC_SYS
--
-+ /usr/include/eigen2
- )
-
- set(SRC
-@@ -117,113 +117,113 @@ set(SRC
- ublas_types.hpp
-
- # until we have another user...
-- ../../extern/Eigen2/Eigen/src/Array/BooleanRedux.h
-- ../../extern/Eigen2/Eigen/src/Array/CwiseOperators.h
-- ../../extern/Eigen2/Eigen/src/Array/Functors.h
-- ../../extern/Eigen2/Eigen/src/Array/Norms.h
-- ../../extern/Eigen2/Eigen/src/Array/PartialRedux.h
-- ../../extern/Eigen2/Eigen/src/Array/Random.h
-- ../../extern/Eigen2/Eigen/src/Array/Select.h
-- ../../extern/Eigen2/Eigen/src/Cholesky/LDLT.h
-- ../../extern/Eigen2/Eigen/src/Cholesky/LLT.h
-- ../../extern/Eigen2/Eigen/src/Core/Assign.h
-- ../../extern/Eigen2/Eigen/src/Core/Block.h
-- ../../extern/Eigen2/Eigen/src/Core/CacheFriendlyProduct.h
-- ../../extern/Eigen2/Eigen/src/Core/Coeffs.h
-- ../../extern/Eigen2/Eigen/src/Core/CommaInitializer.h
-- ../../extern/Eigen2/Eigen/src/Core/Cwise.h
-- ../../extern/Eigen2/Eigen/src/Core/CwiseBinaryOp.h
-- ../../extern/Eigen2/Eigen/src/Core/CwiseNullaryOp.h
-- ../../extern/Eigen2/Eigen/src/Core/CwiseUnaryOp.h
-- ../../extern/Eigen2/Eigen/src/Core/DiagonalCoeffs.h
-- ../../extern/Eigen2/Eigen/src/Core/DiagonalMatrix.h
-- ../../extern/Eigen2/Eigen/src/Core/DiagonalProduct.h
-- ../../extern/Eigen2/Eigen/src/Core/Dot.h
-- ../../extern/Eigen2/Eigen/src/Core/Flagged.h
-- ../../extern/Eigen2/Eigen/src/Core/Functors.h
-- ../../extern/Eigen2/Eigen/src/Core/Fuzzy.h
-- ../../extern/Eigen2/Eigen/src/Core/GenericPacketMath.h
-- ../../extern/Eigen2/Eigen/src/Core/IO.h
-- ../../extern/Eigen2/Eigen/src/Core/Map.h
-- ../../extern/Eigen2/Eigen/src/Core/MapBase.h
-- ../../extern/Eigen2/Eigen/src/Core/MathFunctions.h
-- ../../extern/Eigen2/Eigen/src/Core/Matrix.h
-- ../../extern/Eigen2/Eigen/src/Core/MatrixBase.h
-- ../../extern/Eigen2/Eigen/src/Core/MatrixStorage.h
-- ../../extern/Eigen2/Eigen/src/Core/Minor.h
-- ../../extern/Eigen2/Eigen/src/Core/NestByValue.h
-- ../../extern/Eigen2/Eigen/src/Core/NumTraits.h
-- ../../extern/Eigen2/Eigen/src/Core/Part.h
-- ../../extern/Eigen2/Eigen/src/Core/Product.h
-- ../../extern/Eigen2/Eigen/src/Core/Redux.h
-- ../../extern/Eigen2/Eigen/src/Core/SolveTriangular.h
-- ../../extern/Eigen2/Eigen/src/Core/Sum.h
-- ../../extern/Eigen2/Eigen/src/Core/Swap.h
-- ../../extern/Eigen2/Eigen/src/Core/Transpose.h
-- ../../extern/Eigen2/Eigen/src/Core/Visitor.h
-- ../../extern/Eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h
-- ../../extern/Eigen2/Eigen/src/Core/arch/SSE/PacketMath.h
-- ../../extern/Eigen2/Eigen/src/Core/util/Constants.h
-- ../../extern/Eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h
-- ../../extern/Eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h
-- ../../extern/Eigen2/Eigen/src/Core/util/ForwardDeclarations.h
-- ../../extern/Eigen2/Eigen/src/Core/util/Macros.h
-- ../../extern/Eigen2/Eigen/src/Core/util/Memory.h
-- ../../extern/Eigen2/Eigen/src/Core/util/Meta.h
-- ../../extern/Eigen2/Eigen/src/Core/util/StaticAssert.h
-- ../../extern/Eigen2/Eigen/src/Core/util/XprHelper.h
-- ../../extern/Eigen2/Eigen/src/Geometry/AlignedBox.h
-- ../../extern/Eigen2/Eigen/src/Geometry/AngleAxis.h
-- ../../extern/Eigen2/Eigen/src/Geometry/EulerAngles.h
-- ../../extern/Eigen2/Eigen/src/Geometry/Hyperplane.h
-- ../../extern/Eigen2/Eigen/src/Geometry/OrthoMethods.h
-- ../../extern/Eigen2/Eigen/src/Geometry/ParametrizedLine.h
-- ../../extern/Eigen2/Eigen/src/Geometry/Quaternion.h
-- ../../extern/Eigen2/Eigen/src/Geometry/Rotation2D.h
-- ../../extern/Eigen2/Eigen/src/Geometry/RotationBase.h
-- ../../extern/Eigen2/Eigen/src/Geometry/Scaling.h
-- ../../extern/Eigen2/Eigen/src/Geometry/Transform.h
-- ../../extern/Eigen2/Eigen/src/Geometry/Translation.h
-- ../../extern/Eigen2/Eigen/src/LU/Determinant.h
-- ../../extern/Eigen2/Eigen/src/LU/Inverse.h
-- ../../extern/Eigen2/Eigen/src/LU/LU.h
-- ../../extern/Eigen2/Eigen/src/LeastSquares/LeastSquares.h
-- ../../extern/Eigen2/Eigen/src/QR/EigenSolver.h
-- ../../extern/Eigen2/Eigen/src/QR/HessenbergDecomposition.h
-- ../../extern/Eigen2/Eigen/src/QR/QR.h
-- ../../extern/Eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h
-- ../../extern/Eigen2/Eigen/src/QR/Tridiagonalization.h
-- ../../extern/Eigen2/Eigen/src/SVD/SVD.h
-- ../../extern/Eigen2/Eigen/src/Sparse/AmbiVector.h
-- ../../extern/Eigen2/Eigen/src/Sparse/CholmodSupport.h
-- ../../extern/Eigen2/Eigen/src/Sparse/CompressedStorage.h
-- ../../extern/Eigen2/Eigen/src/Sparse/CoreIterators.h
-- ../../extern/Eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
-- ../../extern/Eigen2/Eigen/src/Sparse/MappedSparseMatrix.h
-- ../../extern/Eigen2/Eigen/src/Sparse/RandomSetter.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseAssign.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseBlock.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwise.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseDot.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseFlagged.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseFuzzy.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseLDLT.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseLLT.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseLU.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrix.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrixBase.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseProduct.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseRedux.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseTranspose.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseUtil.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SparseVector.h
-- ../../extern/Eigen2/Eigen/src/Sparse/SuperLUSupport.h
-- ../../extern/Eigen2/Eigen/src/Sparse/TaucsSupport.h
-- ../../extern/Eigen2/Eigen/src/Sparse/TriangularSolver.h
-- ../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h
-+ /usr/include/eigen2/Eigen/src/Array/BooleanRedux.h
-+ /usr/include/eigen2/Eigen/src/Array/CwiseOperators.h
-+ /usr/include/eigen2/Eigen/src/Array/Functors.h
-+ /usr/include/eigen2/Eigen/src/Array/Norms.h
-+ /usr/include/eigen2/Eigen/src/Array/PartialRedux.h
-+ /usr/include/eigen2/Eigen/src/Array/Random.h
-+ /usr/include/eigen2/Eigen/src/Array/Select.h
-+ /usr/include/eigen2/Eigen/src/Cholesky/LDLT.h
-+ /usr/include/eigen2/Eigen/src/Cholesky/LLT.h
-+ /usr/include/eigen2/Eigen/src/Core/Assign.h
-+ /usr/include/eigen2/Eigen/src/Core/Block.h
-+ /usr/include/eigen2/Eigen/src/Core/CacheFriendlyProduct.h
-+ /usr/include/eigen2/Eigen/src/Core/Coeffs.h
-+ /usr/include/eigen2/Eigen/src/Core/CommaInitializer.h
-+ /usr/include/eigen2/Eigen/src/Core/Cwise.h
-+ /usr/include/eigen2/Eigen/src/Core/CwiseBinaryOp.h
-+ /usr/include/eigen2/Eigen/src/Core/CwiseNullaryOp.h
-+ /usr/include/eigen2/Eigen/src/Core/CwiseUnaryOp.h
-+ /usr/include/eigen2/Eigen/src/Core/DiagonalCoeffs.h
-+ /usr/include/eigen2/Eigen/src/Core/DiagonalMatrix.h
-+ /usr/include/eigen2/Eigen/src/Core/DiagonalProduct.h
-+ /usr/include/eigen2/Eigen/src/Core/Dot.h
-+ /usr/include/eigen2/Eigen/src/Core/Flagged.h
-+ /usr/include/eigen2/Eigen/src/Core/Functors.h
-+ /usr/include/eigen2/Eigen/src/Core/Fuzzy.h
-+ /usr/include/eigen2/Eigen/src/Core/GenericPacketMath.h
-+ /usr/include/eigen2/Eigen/src/Core/IO.h
-+ /usr/include/eigen2/Eigen/src/Core/Map.h
-+ /usr/include/eigen2/Eigen/src/Core/MapBase.h
-+ /usr/include/eigen2/Eigen/src/Core/MathFunctions.h
-+ /usr/include/eigen2/Eigen/src/Core/Matrix.h
-+ /usr/include/eigen2/Eigen/src/Core/MatrixBase.h
-+ /usr/include/eigen2/Eigen/src/Core/MatrixStorage.h
-+ /usr/include/eigen2/Eigen/src/Core/Minor.h
-+ /usr/include/eigen2/Eigen/src/Core/NestByValue.h
-+ /usr/include/eigen2/Eigen/src/Core/NumTraits.h
-+ /usr/include/eigen2/Eigen/src/Core/Part.h
-+ /usr/include/eigen2/Eigen/src/Core/Product.h
-+ /usr/include/eigen2/Eigen/src/Core/Redux.h
-+ /usr/include/eigen2/Eigen/src/Core/SolveTriangular.h
-+ /usr/include/eigen2/Eigen/src/Core/Sum.h
-+ /usr/include/eigen2/Eigen/src/Core/Swap.h
-+ /usr/include/eigen2/Eigen/src/Core/Transpose.h
-+ /usr/include/eigen2/Eigen/src/Core/Visitor.h
-+ /usr/include/eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h
-+ /usr/include/eigen2/Eigen/src/Core/arch/SSE/PacketMath.h
-+ /usr/include/eigen2/Eigen/src/Core/util/Constants.h
-+ /usr/include/eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h
-+ /usr/include/eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h
-+ /usr/include/eigen2/Eigen/src/Core/util/ForwardDeclarations.h
-+ /usr/include/eigen2/Eigen/src/Core/util/Macros.h
-+ /usr/include/eigen2/Eigen/src/Core/util/Memory.h
-+ /usr/include/eigen2/Eigen/src/Core/util/Meta.h
-+ /usr/include/eigen2/Eigen/src/Core/util/StaticAssert.h
-+ /usr/include/eigen2/Eigen/src/Core/util/XprHelper.h
-+ /usr/include/eigen2/Eigen/src/Geometry/AlignedBox.h
-+ /usr/include/eigen2/Eigen/src/Geometry/AngleAxis.h
-+ /usr/include/eigen2/Eigen/src/Geometry/EulerAngles.h
-+ /usr/include/eigen2/Eigen/src/Geometry/Hyperplane.h
-+ /usr/include/eigen2/Eigen/src/Geometry/OrthoMethods.h
-+ /usr/include/eigen2/Eigen/src/Geometry/ParametrizedLine.h
-+ /usr/include/eigen2/Eigen/src/Geometry/Quaternion.h
-+ /usr/include/eigen2/Eigen/src/Geometry/Rotation2D.h
-+ /usr/include/eigen2/Eigen/src/Geometry/RotationBase.h
-+ /usr/include/eigen2/Eigen/src/Geometry/Scaling.h
-+ /usr/include/eigen2/Eigen/src/Geometry/Transform.h
-+ /usr/include/eigen2/Eigen/src/Geometry/Translation.h
-+ /usr/include/eigen2/Eigen/src/LU/Determinant.h
-+ /usr/include/eigen2/Eigen/src/LU/Inverse.h
-+ /usr/include/eigen2/Eigen/src/LU/LU.h
-+ /usr/include/eigen2/Eigen/src/LeastSquares/LeastSquares.h
-+ /usr/include/eigen2/Eigen/src/QR/EigenSolver.h
-+ /usr/include/eigen2/Eigen/src/QR/HessenbergDecomposition.h
-+ /usr/include/eigen2/Eigen/src/QR/QR.h
-+ /usr/include/eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h
-+ /usr/include/eigen2/Eigen/src/QR/Tridiagonalization.h
-+ /usr/include/eigen2/Eigen/src/SVD/SVD.h
-+ /usr/include/eigen2/Eigen/src/Sparse/AmbiVector.h
-+ /usr/include/eigen2/Eigen/src/Sparse/CholmodSupport.h
-+ /usr/include/eigen2/Eigen/src/Sparse/CompressedStorage.h
-+ /usr/include/eigen2/Eigen/src/Sparse/CoreIterators.h
-+ /usr/include/eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
-+ /usr/include/eigen2/Eigen/src/Sparse/MappedSparseMatrix.h
-+ /usr/include/eigen2/Eigen/src/Sparse/RandomSetter.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseAssign.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseBlock.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseCwise.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseDot.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseFlagged.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseFuzzy.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseLDLT.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseLLT.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseLU.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseMatrix.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseMatrixBase.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseProduct.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseRedux.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseTranspose.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseUtil.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SparseVector.h
-+ /usr/include/eigen2/Eigen/src/Sparse/SuperLUSupport.h
-+ /usr/include/eigen2/Eigen/src/Sparse/TaucsSupport.h
-+ /usr/include/eigen2/Eigen/src/Sparse/TriangularSolver.h
-+ /usr/include/eigen2/Eigen/src/Sparse/UmfPackSupport.h
- )
-
- blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}")
---- source/blender/ikplugin/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100
-+++ source/blender/ikplugin/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100
-@@ -50,7 +50,7 @@
- if(WITH_IK_ITASC)
- add_definitions(-DWITH_IK_ITASC)
- list(APPEND INC
-- ../../../extern/Eigen2
-+ /usr/include/eigen2
- ../../../intern/itasc
- )
- list(APPEND SRC
---- source/gameengine/Converter/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100
-+++ source/gameengine/Converter/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100
-@@ -51,7 +51,7 @@
- ../../blender/makesrna
- ../../blender/windowmanager
- ../../../extern/bullet2/src
-- ../../../extern/Eigen2
-+ /usr/include/eigen2
- ../../../intern/container
- ../../../intern/guardedalloc
- ../../../intern/moto/include
diff --git a/media-gfx/blender/files/blender-2.60-glew.patch b/media-gfx/blender/files/blender-2.60-glew.patch
deleted file mode 100644
index edc0c9b..0000000
--- a/media-gfx/blender/files/blender-2.60-glew.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- extern/SConscript
-+++ extern/SConscript
-@@ -2,8 +2,6 @@
-
- Import('env')
-
--SConscript(['glew/SConscript'])
--
- if env['WITH_BF_GAMEENGINE']:
- SConscript(['recastnavigation/SConscript'])
-
- if env['WITH_BF_ELTOPO']:
- SConscript(['eltopo/SConscript'])
-
---- source/blender/editors/include/BIF_gl.h
-+++ source/blender/editors/include/BIF_gl.h
-@@ -35,7 +35,7 @@
- #ifndef BIF_GL_H
- #define BIF_GL_H
-
--#include "GL/glew.h"
-+#include <GL/glew.h>
-
- /*
- * these should be phased out. cpack should be replaced in
---- extern/CMakeLists.txt
-+++ extern/CMakeLists.txt
-@@ -39,9 +39,6 @@
- add_subdirectory(binreloc)
- endif()
-
--if(WITH_BUILTIN_GLEW)
-- add_subdirectory(glew)
--endif()
-
- if(WITH_GAMEENGINE)
- add_subdirectory(recastnavigation)
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -150,7 +150,7 @@
-
- if(UNIX AND NOT APPLE)
- option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support)" ON)
-- option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
-+ option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" OFF)
- else()
- # not an option for other OS's
- set(WITH_BUILTIN_GLEW ON)
diff --git a/media-gfx/blender/files/blender-2.60-libav-0.7.patch b/media-gfx/blender/files/blender-2.60-libav-0.7.patch
deleted file mode 100644
index 3bae020..0000000
--- a/media-gfx/blender/files/blender-2.60-libav-0.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- blender-2.60a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2011-10-24 20:09:01.000000000 +0200
-+++ blender-2.60a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2011-11-13 12:34:01.000000000 +0100
-@@ -40,6 +40,8 @@
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
-+#include <libavutil/mathematics.h>
-+#include <libavutil/avstring.h>
- #include "ffmpeg_compat.h"
- }
-
-@@ -57,10 +58,15 @@
- {
- static const char* formats[] = { NULL, "ac3", "flac", "matroska", "mp2", "mp3", "ogg", "wav" };
-
-- if(avformat_alloc_output_context2(&m_formatCtx, NULL, formats[format], filename.c_str()))
-- AUD_THROW(AUD_ERROR_FFMPEG, context_error);
-+ m_formatCtx = avformat_alloc_context();
-+ if (!m_formatCtx) AUD_THROW(AUD_ERROR_FFMPEG, context_error);
-
-- m_outputFmt = m_formatCtx->oformat;
-+ av_strlcpy(m_formatCtx->filename, filename.c_str(), sizeof(m_formatCtx->filename));
-+ m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], filename.c_str(), NULL);
-+ if (!m_outputFmt) {
-+ avformat_free_context(m_formatCtx);
-+ AUD_THROW(AUD_ERROR_FFMPEG, context_error);
-+ }
-
- switch(codec)
- {
diff --git a/media-gfx/blender/files/blender-2.60-linux-3.patch b/media-gfx/blender/files/blender-2.60-linux-3.patch
deleted file mode 100644
index 6a96b49..0000000
--- a/media-gfx/blender/files/blender-2.60-linux-3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- SConstruct 2011-10-29 05:18:43.149564401 +0200
-+++ SConstruct 2011-10-29 05:19:37.332887017 +0200
-@@ -165,6 +165,9 @@
- if crossbuild and platform not in ('win32-vc', 'win64-vc'):
- platform = 'linuxcross'
-
-+if platform == 'linux3':
-+ platform = 'linux2' # Workaround for Linux 3.x
-+
- env['OURPLATFORM'] = platform
-
- configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
diff --git a/media-gfx/blender/files/blender-2.60-openjpeg.patch b/media-gfx/blender/files/blender-2.60-openjpeg.patch
deleted file mode 100644
index 74f6441..0000000
--- a/media-gfx/blender/files/blender-2.60-openjpeg.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Npur blender-2.60a.orig/extern/libredcode/SConscript blender-2.60a/extern/libredcode/SConscript
---- blender-2.60a.orig/extern/libredcode/SConscript 2011-11-09 23:05:16.241465491 +0100
-+++ blender-2.60a/extern/libredcode/SConscript 2011-11-09 23:06:24.188464236 +0100
-@@ -7,7 +7,8 @@
- Import('env')
-
- sources = env.Glob('*.c')
--incs = '. ../libopenjpeg'
-+#incs = '. ../libopenjpeg'
-+incs = '. /usr/include'
-
- env.BlenderLib ( libname='extern_redcode',
- sources=sources, includes=Split(incs),
-diff -Npur blender-2.60a.orig/extern/SConscript blender-2.60a/extern/SConscript
---- blender-2.60a.orig/extern/SConscript 2011-11-09 23:05:16.241465491 +0100
-+++ blender-2.60a/extern/SConscript 2011-11-09 23:06:24.188464236 +0100
-@@ -11,8 +11,5 @@
- if env['WITH_BF_BULLET']:
- SConscript(['bullet2/src/SConscript'])
-
--if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '':
-- SConscript(['libopenjpeg/SConscript'])
--
- if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '':
- SConscript(['libredcode/SConscript'])
-diff -Npur blender-2.60a.orig/build_files/scons/tools/Blender.py blender-2.60a/build_files/scons/tools/Blender.py
---- blender-2.60a.orig/build_files/scons/tools/Blender.py 2011-11-09 23:05:16.241465491 +0100
-+++ blender-2.60a/build_files/scons/tools/Blender.py 2011-11-09 23:06:24.188464236 +0100
-@@ -246,6 +246,8 @@
- syslibs += Split(lenv['BF_FFMPEG_LIB'])
- if lenv['WITH_BF_OGG']:
- syslibs += Split(lenv['BF_OGG_LIB'])
-+ if lenv['WITH_BF_OPENJPEG']:
-+ syslibs += Split(lenv['BF_OPENJPEG_LIB'])
- if lenv['WITH_BF_JACK']:
- syslibs += Split(lenv['BF_JACK_LIB'])
- if lenv['WITH_BF_SNDFILE'] and not lenv['WITH_BF_STATICSNDFILE']:
diff --git a/media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch b/media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch
deleted file mode 100644
index fc0278d..0000000
--- a/media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -Npur blender-2.60a.orig/source/blender/blenkernel/intern/blender.c blender-2.60a/source/blender/blenkernel/intern/blender.c
---- blender-2.60a.orig/source/blender/blenkernel/intern/blender.c 2011-11-09 20:56:11.905602401 +0100
-+++ blender-2.60a/source/blender/blenkernel/intern/blender.c 2011-11-09 20:56:42.827601857 +0100
-@@ -145,6 +145,7 @@ void initglobals(void)
- G.f |= G_SCRIPT_AUTOEXEC;
- #else
- G.f &= ~G_SCRIPT_AUTOEXEC;
-+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- #endif
- }
-
-diff -Npur blender-2.60a.orig/source/blender/makesrna/intern/rna_userdef.c blender-2.60a/source/blender/makesrna/intern/rna_userdef.c
---- blender-2.60a.orig/source/blender/makesrna/intern/rna_userdef.c 2011-11-09 20:56:12.003602399 +0100
-+++ blender-2.60a/source/blender/makesrna/intern/rna_userdef.c 2011-11-09 21:02:43.204595484 +0100
-@@ -116,9 +116,17 @@ static void rna_userdef_show_manipulator
-
- static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
- {
-- UserDef *userdef = (UserDef*)ptr->data;
-- if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC;
-- else G.f |= G_SCRIPT_AUTOEXEC;
-+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+ /* Blender run with --enable-autoexec */
-+ UserDef *userdef = (UserDef*)ptr->data;
-+ if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC;
-+ else G.f |= G_SCRIPT_AUTOEXEC;
-+ }
-+}
-+
-+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) {
-+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+ return !(G.f & G_SCRIPT_OVERRIDE_PREF);
- }
-
- static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr)
-@@ -2630,6 +2638,8 @@ static void rna_def_userdef_system(Blend
- "Allow any .blend file to run scripts automatically "
- "(unsafe with blend files from an untrusted source)");
- RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update");
-+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+ RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable");
-
- prop= RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE);
-diff -Npur blender-2.60a.orig/source/blender/windowmanager/intern/wm_files.c blender-2.60a/source/blender/windowmanager/intern/wm_files.c
---- blender-2.60a.orig/source/blender/windowmanager/intern/wm_files.c 2011-11-09 20:56:12.458602413 +0100
-+++ blender-2.60a/source/blender/windowmanager/intern/wm_files.c 2011-11-09 21:05:16.768592770 +0100
-@@ -285,12 +285,17 @@ static void wm_init_userdef(bContext *C)
-
- /* set the python auto-execute setting from user prefs */
- /* enabled by default, unless explicitly enabled in the command line which overrides */
-- if((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+ if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) {
-+ /* Blender run with --enable-autoexec */
- if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |= G_SCRIPT_AUTOEXEC;
- else G.f &= ~G_SCRIPT_AUTOEXEC;
- }
- /* update tempdir from user preferences */
- BLI_where_is_temp(btempdir, FILE_MAX, 1);
-+
-+ /* Workaround to fix default of "Auto Run Python Scripts" checkbox */
-+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC))
-+ U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE;
- }
-
-
-diff -Npur blender-2.60a.orig/source/blender/windowmanager/intern/wm_operators.c blender-2.60a/source/blender/windowmanager/intern/wm_operators.c
---- blender-2.60a.orig/source/blender/windowmanager/intern/wm_operators.c 2011-11-09 20:56:12.458602413 +0100
-+++ blender-2.60a/source/blender/windowmanager/intern/wm_operators.c 2011-11-09 21:07:09.746590772 +0100
-@@ -1583,12 +1583,13 @@ static int wm_open_mainfile_exec(bContex
- G.fileflags &= ~G_FILE_NO_UI;
- else
- G.fileflags |= G_FILE_NO_UI;
--
-- if(RNA_boolean_get(op->ptr, "use_scripts"))
-+
-+ /* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */
-+ if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF)))
- G.f |= G_SCRIPT_AUTOEXEC;
- else
- G.f &= ~G_SCRIPT_AUTOEXEC;
--
-+
- // XXX wm in context is not set correctly after WM_read_file -> crash
- // do it before for now, but is this correct with multiple windows?
- WM_event_add_notifier(C, NC_WINDOW, NULL);
-@@ -1600,6 +1601,8 @@ static int wm_open_mainfile_exec(bContex
-
- static void WM_OT_open_mainfile(wmOperatorType *ot)
- {
-+ PropertyRNA * use_scripts_checkbox = NULL;
-+
- ot->name= "Open Blender File";
- ot->idname= "WM_OT_open_mainfile";
- ot->description="Open a Blender file";
-@@ -1611,7 +1614,12 @@ static void WM_OT_open_mainfile(wmOperat
- WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH);
-
- RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file");
-- RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", "Allow blend file execute scripts automatically, default available from system preferences");
-+ use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts",
-+ !!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source",
-+ "Allow blend file execute scripts automatically, default available from system preferences");
-+ /* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */
-+ if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF))
-+ RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE);
- }
-
- /* **************** link/append *************** */
-diff -Npur blender-2.60a.orig/source/creator/creator.c blender-2.60a/source/creator/creator.c
---- blender-2.60a.orig/source/creator/creator.c 2011-11-09 20:56:11.899602401 +0100
-+++ blender-2.60a/source/creator/creator.c 2011-11-09 21:17:22.278579932 +0100
-@@ -258,6 +258,7 @@ static int print_help(int UNUSED(argc),
-
- printf("\n");
-
-+ BLI_argsPrintArgDoc(ba, "-666");
- BLI_argsPrintArgDoc(ba, "--enable-autoexec");
- BLI_argsPrintArgDoc(ba, "--disable-autoexec");
-
-@@ -326,14 +327,14 @@ static int end_arguments(int UNUSED(argc
- static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- G.f |= G_SCRIPT_AUTOEXEC;
-- G.f |= G_SCRIPT_OVERRIDE_PREF;
-+ G.f &= ~G_SCRIPT_OVERRIDE_PREF; /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */
- return 0;
- }
-
- static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- G.f &= ~G_SCRIPT_AUTOEXEC;
-- G.f |= G_SCRIPT_OVERRIDE_PREF;
-+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- return 0;
- }
-
-@@ -1055,8 +1056,9 @@ static void setupArguments(bContext *C,
- # define PY_DISABLE_AUTO ", (compiled as non-standard default)"
- #endif
-
-- BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution" PY_ENABLE_AUTO, enable_python, NULL);
-- BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO, disable_python, NULL);
-+ BLI_argsAdd(ba, 1, NULL, "-666", "\n\tEnable automatic python script execution (port from CVE-2009-3850 patch to Blender 2.60a)" PY_ENABLE_AUTO, enable_python, NULL);
-+ BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution" PY_ENABLE_AUTO, enable_python, NULL);
-+ BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO, disable_python, NULL);
-
- #undef PY_ENABLE_AUTO
- #undef PY_DISABLE_AUTO
diff --git a/media-gfx/blender/files/blender-2.60a-cmake.patch b/media-gfx/blender/files/blender-2.60a-cmake.patch
deleted file mode 100644
index 0355850..0000000
--- a/media-gfx/blender/files/blender-2.60a-cmake.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- source/creator/CMakeLists.txt.orig 2011-11-11 01:19:03.166796150 +0100
-+++ source/creator/CMakeLists.txt 2011-11-11 01:19:48.300795335 +0100
-@@ -745,6 +745,7 @@ set(BLENDER_LINK_LIBS
- ${BLENDER_LINK_LIBS}
- bf_windowmanager
- bf_render
-+ bf_render_raytrace
- )
-
- if(WITH_MOD_FLUID)
-@@ -795,6 +796,7 @@ endif()
- bf_editor_datafiles
-
- bf_render
-+ bf_render_raytrace
- bf_intern_opennl
- bf_python
- bf_python_ext
---- source/blender/render/CMakeLists.txt.orig 2011-11-11 01:19:26.089795736 +0100
-+++ source/blender/render/CMakeLists.txt 2011-11-11 01:21:56.243793090 +0100
-@@ -43,6 +43,27 @@ set(INC_SYS
-
- )
-
-+set(SRC_RAYTRACE
-+ intern/raytrace/rayobject.cpp
-+ intern/raytrace/rayobject_empty.cpp
-+ intern/raytrace/rayobject_octree.cpp
-+ intern/raytrace/rayobject_raycounter.cpp
-+ intern/raytrace/rayobject_svbvh.cpp
-+ intern/raytrace/rayobject_blibvh.cpp
-+ intern/raytrace/rayobject_instance.cpp
-+ intern/raytrace/rayobject_qbvh.cpp
-+ intern/raytrace/rayobject_rtbuild.cpp
-+ intern/raytrace/rayobject_vbvh.cpp
-+
-+ intern/raytrace/bvh.h
-+ intern/raytrace/rayobject_hint.h
-+ intern/raytrace/rayobject_internal.h
-+ intern/raytrace/rayobject_rtbuild.h
-+ intern/raytrace/reorganize.h
-+ intern/raytrace/svbvh.h
-+ intern/raytrace/vbvh.h
-+)
-+
- set(SRC
- intern/raytrace/rayobject.cpp
- intern/raytrace/rayobject_empty.cpp
-@@ -107,13 +128,6 @@ set(SRC
- intern/include/volumetric.h
- intern/include/voxeldata.h
- intern/include/zbuf.h
-- intern/raytrace/bvh.h
-- intern/raytrace/rayobject_hint.h
-- intern/raytrace/rayobject_internal.h
-- intern/raytrace/rayobject_rtbuild.h
-- intern/raytrace/reorganize.h
-- intern/raytrace/svbvh.h
-- intern/raytrace/vbvh.h
- )
-
- if(WITH_IMAGE_OPENEXR)
-@@ -142,3 +156,4 @@ if(APPLE)
- endif()
-
- blender_add_lib_nolist(bf_render "${SRC}" "${INC}" "${INC_SYS}")
-+blender_add_lib_nolist(bf_render_raytrace "${SRC_RAYTRACE}" "${INC}" "${INC_SYS}")
diff --git a/media-gfx/blender/files/blender-2.60a-desktop.patch b/media-gfx/blender/files/blender-2.60a-desktop.patch
deleted file mode 100644
index c774cbe..0000000
--- a/media-gfx/blender/files/blender-2.60a-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- release/freedesktop/blender.desktop 2010-09-12 00:05:51.000000000 -0700
-+++ release/freedesktop/blender.desktop 2010-09-12 00:07:32.000000000 -0700
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Blender
-+Name=Blender-2.60a
- GenericName=3D modeller
- GenericName[es]=modelador 3D
- GenericName[de]=3D Modellierer
-@@ -7,8 +7,8 @@
- GenericName[ru]=Редактор 3D-моделей
- Comment=3D modeling, animation, rendering and post-production
- Comment[es]=modelado 3D, animación, renderizado y post-producción
--Exec=blender
--Icon=blender
-+Exec=blender-2.60
-+Icon=blender-2.60
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;
diff --git a/media-gfx/blender/files/blender-2.60a-enable_site_module.patch b/media-gfx/blender/files/blender-2.60a-enable_site_module.patch
deleted file mode 100644
index 8a44c36..0000000
--- a/media-gfx/blender/files/blender-2.60a-enable_site_module.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- source/blender/python/intern/bpy_interface.c
-+++ source/blender/python/intern/bpy_interface.c
-@@ -203,11 +203,6 @@
- /* allow to use our own included python */
- PyC_SetHomePath(BLI_get_folder(BLENDER_SYSTEM_PYTHON, NULL));
-
-- /* Python 3.2 now looks for '2.58/python/include/python3.2d/pyconfig.h' to parse
-- * from the 'sysconfig' module which is used by 'site', so for now disable site.
-- * alternatively we could copy the file. */
-- Py_NoSiteFlag= 1;
--
- Py_Initialize();
-
- // PySys_SetArgv(argc, argv); // broken in py3, not a huge deal
---- source/gameengine/Ketsji/KX_PythonInit.cpp
-+++ source/gameengine/Ketsji/KX_PythonInit.cpp
-@@ -1825,7 +1825,6 @@
- STR_String pname = progname;
- Py_SetProgramName(pname.Ptr());
- #endif
-- Py_NoSiteFlag=1;
- Py_FrozenFlag=1;
-
- /* must run before python initializes */
-@@ -1898,7 +1897,6 @@
- STR_String pname = progname;
- Py_SetProgramName(pname.Ptr());
- #endif
-- Py_NoSiteFlag=1;
- Py_FrozenFlag=1;
-
- initPyTypes();
diff --git a/media-gfx/blender/files/blender-2.60a-insecure.desktop b/media-gfx/blender/files/blender-2.60a-insecure.desktop
deleted file mode 100644
index d033ae9..0000000
--- a/media-gfx/blender/files/blender-2.60a-insecure.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Blender-2.60a (reduced security)
-GenericName=3D modeller (reduced security)
-GenericName[es]=modelador 3D (reduced security)
-GenericName[de]=3D Modellierer (weniger Sicherheit)
-GenericName[fr]=modeleur 3D (reduced security)
-GenericName[ru]=Редактор 3D-моделей (reduced security)
-Comment=3D modeling, animation, rendering and post-production
-Comment[es]=modelado 3D, animación, renderizado y post-producción
-Exec=blender-2.60 --enable-autoexec
-Icon=blender-2.60
-Terminal=false
-Type=Application
-Categories=Graphics;3DGraphics;
-MimeType=application/x-blender;
diff --git a/media-gfx/blender/files/blender-2.60a-libav-0.7.patch b/media-gfx/blender/files/blender-2.60a-libav-0.7.patch
deleted file mode 100644
index 3bae020..0000000
--- a/media-gfx/blender/files/blender-2.60a-libav-0.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- blender-2.60a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2011-10-24 20:09:01.000000000 +0200
-+++ blender-2.60a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2011-11-13 12:34:01.000000000 +0100
-@@ -40,6 +40,8 @@
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
-+#include <libavutil/mathematics.h>
-+#include <libavutil/avstring.h>
- #include "ffmpeg_compat.h"
- }
-
-@@ -57,10 +58,15 @@
- {
- static const char* formats[] = { NULL, "ac3", "flac", "matroska", "mp2", "mp3", "ogg", "wav" };
-
-- if(avformat_alloc_output_context2(&m_formatCtx, NULL, formats[format], filename.c_str()))
-- AUD_THROW(AUD_ERROR_FFMPEG, context_error);
-+ m_formatCtx = avformat_alloc_context();
-+ if (!m_formatCtx) AUD_THROW(AUD_ERROR_FFMPEG, context_error);
-
-- m_outputFmt = m_formatCtx->oformat;
-+ av_strlcpy(m_formatCtx->filename, filename.c_str(), sizeof(m_formatCtx->filename));
-+ m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], filename.c_str(), NULL);
-+ if (!m_outputFmt) {
-+ avformat_free_context(m_formatCtx);
-+ AUD_THROW(AUD_ERROR_FFMPEG, context_error);
-+ }
-
- switch(codec)
- {
diff --git a/media-gfx/blender/files/blender-2.60a-linux-3.patch b/media-gfx/blender/files/blender-2.60a-linux-3.patch
deleted file mode 100644
index 6a96b49..0000000
--- a/media-gfx/blender/files/blender-2.60a-linux-3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- SConstruct 2011-10-29 05:18:43.149564401 +0200
-+++ SConstruct 2011-10-29 05:19:37.332887017 +0200
-@@ -165,6 +165,9 @@
- if crossbuild and platform not in ('win32-vc', 'win64-vc'):
- platform = 'linuxcross'
-
-+if platform == 'linux3':
-+ platform = 'linux2' # Workaround for Linux 3.x
-+
- env['OURPLATFORM'] = platform
-
- configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
diff --git a/media-gfx/blender/files/blender-2.61-CVE-2009-3850-v3.patch b/media-gfx/blender/files/blender-2.61-CVE-2009-3850-v3.patch
deleted file mode 100644
index 48895a8..0000000
--- a/media-gfx/blender/files/blender-2.61-CVE-2009-3850-v3.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff -Npur blender-2.61.orig/source/blender/blenkernel/intern/blender.c blender-2.61/source/blender/blenkernel/intern/blender.c
---- blender-2.61.orig/source/blender/blenkernel/intern/blender.c 2011-12-20 20:47:10.884735950 +0100
-+++ blender-2.61/source/blender/blenkernel/intern/blender.c 2011-12-20 20:47:58.500735116 +0100
-@@ -144,6 +144,7 @@ void initglobals(void)
- G.f |= G_SCRIPT_AUTOEXEC;
- #else
- G.f &= ~G_SCRIPT_AUTOEXEC;
-+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- #endif
- }
-
-diff -Npur blender-2.61.orig/source/blender/makesrna/intern/rna_userdef.c blender-2.61/source/blender/makesrna/intern/rna_userdef.c
---- blender-2.61.orig/source/blender/makesrna/intern/rna_userdef.c 2011-12-20 20:47:10.891735952 +0100
-+++ blender-2.61/source/blender/makesrna/intern/rna_userdef.c 2011-12-20 20:50:32.755732385 +0100
-@@ -114,9 +114,17 @@ static void rna_userdef_show_manipulator
-
- static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
- {
-- UserDef *userdef = (UserDef*)ptr->data;
-- if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC;
-- else G.f |= G_SCRIPT_AUTOEXEC;
-+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+ /* Blender run with --enable-autoexec */
-+ UserDef *userdef = (UserDef*)ptr->data;
-+ if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC;
-+ else G.f |= G_SCRIPT_AUTOEXEC;
-+ }
-+}
-+
-+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) {
-+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+ return !(G.f & G_SCRIPT_OVERRIDE_PREF);
- }
-
- static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr)
-@@ -2729,6 +2737,8 @@ static void rna_def_userdef_system(Blend
- "Allow any .blend file to run scripts automatically "
- "(unsafe with blend files from an untrusted source)");
- RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update");
-+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+ RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable");
-
- prop= RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE);
-diff -Npur blender-2.61.orig/source/blender/windowmanager/intern/wm_files.c blender-2.61/source/blender/windowmanager/intern/wm_files.c
---- blender-2.61.orig/source/blender/windowmanager/intern/wm_files.c 2011-12-20 20:47:10.943735949 +0100
-+++ blender-2.61/source/blender/windowmanager/intern/wm_files.c 2011-12-20 20:52:16.097730555 +0100
-@@ -286,13 +286,18 @@ static void wm_init_userdef(bContext *C)
-
- /* set the python auto-execute setting from user prefs */
- /* enabled by default, unless explicitly enabled in the command line which overrides */
-- if((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+ if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) {
-+ /* Blender run with --enable-autoexec */
- if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |= G_SCRIPT_AUTOEXEC;
- else G.f &= ~G_SCRIPT_AUTOEXEC;
- }
-
- /* update tempdir from user preferences */
- BLI_init_temporary_dir(U.tempdir);
-+
-+ /* Workaround to fix default of "Auto Run Python Scripts" checkbox */
-+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC))
-+ U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE;
- }
-
-
-diff -Npur blender-2.61.orig/source/blender/windowmanager/intern/wm_operators.c blender-2.61/source/blender/windowmanager/intern/wm_operators.c
---- blender-2.61.orig/source/blender/windowmanager/intern/wm_operators.c 2011-12-20 20:47:10.943735949 +0100
-+++ blender-2.61/source/blender/windowmanager/intern/wm_operators.c 2011-12-20 20:57:09.176725378 +0100
-@@ -1601,12 +1601,13 @@ static int wm_open_mainfile_exec(bContex
- G.fileflags &= ~G_FILE_NO_UI;
- else
- G.fileflags |= G_FILE_NO_UI;
--
-- if(RNA_boolean_get(op->ptr, "use_scripts"))
-+
-+ /* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */
-+ if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF)))
- G.f |= G_SCRIPT_AUTOEXEC;
- else
- G.f &= ~G_SCRIPT_AUTOEXEC;
--
-+
- // XXX wm in context is not set correctly after WM_read_file -> crash
- // do it before for now, but is this correct with multiple windows?
- WM_event_add_notifier(C, NC_WINDOW, NULL);
-@@ -1618,6 +1619,8 @@ static int wm_open_mainfile_exec(bContex
-
- static void WM_OT_open_mainfile(wmOperatorType *ot)
- {
-+ PropertyRNA * use_scripts_checkbox = NULL;
-+
- ot->name= "Open Blender File";
- ot->idname= "WM_OT_open_mainfile";
- ot->description="Open a Blender file";
-@@ -1629,7 +1632,12 @@ static void WM_OT_open_mainfile(wmOperat
- WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH);
-
- RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file");
-- RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", "Allow blend file execute scripts automatically, default available from system preferences");
-+ use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts",
-+ !!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source",
-+ "Allow blend file execute scripts automatically, default available from system preferences");
-+ /* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */
-+ if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF))
-+ RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE);
- }
-
- /* **************** link/append *************** */
-diff -Npur blender-2.61.orig/source/creator/creator.c blender-2.61/source/creator/creator.c
---- blender-2.61.orig/source/creator/creator.c 2011-12-20 20:47:10.878735951 +0100
-+++ blender-2.61/source/creator/creator.c 2011-12-20 20:59:23.778723050 +0100
-@@ -262,6 +262,7 @@ static int print_help(int UNUSED(argc),
-
- printf("\n");
-
-+ BLI_argsPrintArgDoc(ba, "-666");
- BLI_argsPrintArgDoc(ba, "--enable-autoexec");
- BLI_argsPrintArgDoc(ba, "--disable-autoexec");
-
-@@ -330,14 +331,14 @@ static int end_arguments(int UNUSED(argc
- static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- G.f |= G_SCRIPT_AUTOEXEC;
-- G.f |= G_SCRIPT_OVERRIDE_PREF;
-+ G.f &= ~G_SCRIPT_OVERRIDE_PREF; /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */
- return 0;
- }
-
- static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- G.f &= ~G_SCRIPT_AUTOEXEC;
-- G.f |= G_SCRIPT_OVERRIDE_PREF;
-+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- return 0;
- }
-
-@@ -1042,6 +1043,7 @@ static void setupArguments(bContext *C,
- # define PY_DISABLE_AUTO ", (compiled as non-standard default)"
- #endif
-
-+ BLI_argsAdd(ba, 1, NULL, "-666", "\n\tEnable automatic python script execution (port from CVE-2009-3850 patch to Blender 2.61)" PY_ENABLE_AUTO, enable_python, NULL);
- BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution" PY_ENABLE_AUTO, enable_python, NULL);
- BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO, disable_python, NULL);
-
diff --git a/media-gfx/blender/files/blender-2.61-CVE-2009-3850-v4.patch b/media-gfx/blender/files/blender-2.61-CVE-2009-3850-v4.patch
deleted file mode 100644
index 956eb50..0000000
--- a/media-gfx/blender/files/blender-2.61-CVE-2009-3850-v4.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -Npur blender-2.61.orig/SConstruct blender-2.61/SConstruct
---- blender-2.61.orig/SConstruct 2012-01-02 16:57:51.329355164 +0100
-+++ blender-2.61/SConstruct 2012-01-02 17:04:36.232349086 +0100
-@@ -346,6 +346,10 @@ if 'blenderplayer' in B.targets:
- if 'blendernogame' in B.targets:
- env['WITH_BF_GAMEENGINE'] = False
-
-+# build without python autoexec security?
-+if env['WITH_PYTHON_SECURITY'] == True:
-+ env.Append(CPPFLAGS=['-DWITH_PYTHON_SECURITY'])
-+
- # build without elbeem (fluidsim)?
- if env['WITH_BF_FLUID'] == 1:
- env['CPPFLAGS'].append('-DWITH_MOD_FLUID')
-diff -Npur blender-2.61.orig/build_files/scons/tools/btools.py blender-2.61/build_files/scons/tools/btools.py
---- blender-2.61.orig/build_files/scons/tools/btools.py 2012-01-02 16:56:21.351357062 +0100
-+++ blender-2.61/build_files/scons/tools/btools.py 2012-01-02 17:01:37.760350726 +0100
-@@ -96,7 +96,7 @@ def print_arguments(args, bc):
-
- def validate_arguments(args, bc):
- opts_list = [
-- 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS',
-+ 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', 'WITH_PYTHON_SECURITY',
- 'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
- 'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
- 'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH',
-@@ -256,6 +256,7 @@ def read_opts(env, cfg, args):
- (BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)),
- (BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)),
- ('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),
-+ (BoolVariable('WITH_PYTHON_SECURITY', 'Disables execution of scripts within blend files by default (recommend to leave off)', False)),
-
- (BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)),
- (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)),
-diff -Npur blender-2.61.orig/source/blender/blenkernel/intern/blender.c blender-2.61/source/blender/blenkernel/intern/blender.c
---- blender-2.61.orig/source/blender/blenkernel/intern/blender.c 2012-01-02 16:57:51.329355164 +0100
-+++ blender-2.61/source/blender/blenkernel/intern/blender.c 2012-01-02 16:48:10.700365736 +0100
-@@ -144,6 +144,7 @@ void initglobals(void)
- G.f |= G_SCRIPT_AUTOEXEC;
- #else
- G.f &= ~G_SCRIPT_AUTOEXEC;
-+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- #endif
- }
-
-diff -Npur blender-2.61.orig/source/blender/makesrna/intern/rna_userdef.c blender-2.61/source/blender/makesrna/intern/rna_userdef.c
---- blender-2.61.orig/source/blender/makesrna/intern/rna_userdef.c 2012-01-02 16:57:51.330355184 +0100
-+++ blender-2.61/source/blender/makesrna/intern/rna_userdef.c 2012-01-02 16:48:10.701365735 +0100
-@@ -114,9 +114,17 @@ static void rna_userdef_show_manipulator
-
- static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
- {
-- UserDef *userdef = (UserDef*)ptr->data;
-- if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC;
-- else G.f |= G_SCRIPT_AUTOEXEC;
-+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+ /* Blender run with --enable-autoexec */
-+ UserDef *userdef = (UserDef*)ptr->data;
-+ if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC;
-+ else G.f |= G_SCRIPT_AUTOEXEC;
-+ }
-+}
-+
-+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) {
-+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+ return !(G.f & G_SCRIPT_OVERRIDE_PREF);
- }
-
- static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr)
-@@ -2729,6 +2737,8 @@ static void rna_def_userdef_system(Blend
- "Allow any .blend file to run scripts automatically "
- "(unsafe with blend files from an untrusted source)");
- RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update");
-+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+ RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable");
-
- prop= RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE);
-diff -Npur blender-2.61.orig/source/blender/windowmanager/intern/wm_files.c blender-2.61/source/blender/windowmanager/intern/wm_files.c
---- blender-2.61.orig/source/blender/windowmanager/intern/wm_files.c 2012-01-02 16:57:51.330355184 +0100
-+++ blender-2.61/source/blender/windowmanager/intern/wm_files.c 2012-01-02 16:48:10.702365735 +0100
-@@ -286,13 +286,18 @@ static void wm_init_userdef(bContext *C)
-
- /* set the python auto-execute setting from user prefs */
- /* enabled by default, unless explicitly enabled in the command line which overrides */
-- if((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+ if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) {
-+ /* Blender run with --enable-autoexec */
- if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |= G_SCRIPT_AUTOEXEC;
- else G.f &= ~G_SCRIPT_AUTOEXEC;
- }
-
- /* update tempdir from user preferences */
- BLI_init_temporary_dir(U.tempdir);
-+
-+ /* Workaround to fix default of "Auto Run Python Scripts" checkbox */
-+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC))
-+ U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE;
- }
-
-
-diff -Npur blender-2.61.orig/source/blender/windowmanager/intern/wm_operators.c blender-2.61/source/blender/windowmanager/intern/wm_operators.c
---- blender-2.61.orig/source/blender/windowmanager/intern/wm_operators.c 2012-01-02 16:57:51.331355194 +0100
-+++ blender-2.61/source/blender/windowmanager/intern/wm_operators.c 2012-01-02 16:48:10.703365736 +0100
-@@ -1601,12 +1601,13 @@ static int wm_open_mainfile_exec(bContex
- G.fileflags &= ~G_FILE_NO_UI;
- else
- G.fileflags |= G_FILE_NO_UI;
--
-- if(RNA_boolean_get(op->ptr, "use_scripts"))
-+
-+ /* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */
-+ if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF)))
- G.f |= G_SCRIPT_AUTOEXEC;
- else
- G.f &= ~G_SCRIPT_AUTOEXEC;
--
-+
- // XXX wm in context is not set correctly after WM_read_file -> crash
- // do it before for now, but is this correct with multiple windows?
- WM_event_add_notifier(C, NC_WINDOW, NULL);
-@@ -1618,6 +1619,8 @@ static int wm_open_mainfile_exec(bContex
-
- static void WM_OT_open_mainfile(wmOperatorType *ot)
- {
-+ PropertyRNA * use_scripts_checkbox = NULL;
-+
- ot->name= "Open Blender File";
- ot->idname= "WM_OT_open_mainfile";
- ot->description="Open a Blender file";
-@@ -1629,7 +1632,12 @@ static void WM_OT_open_mainfile(wmOperat
- WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH);
-
- RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file");
-- RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", "Allow blend file execute scripts automatically, default available from system preferences");
-+ use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts",
-+ !!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source",
-+ "Allow blend file execute scripts automatically, default available from system preferences");
-+ /* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */
-+ if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF))
-+ RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE);
- }
-
- /* **************** link/append *************** */
-diff -Npur blender-2.61.orig/source/creator/creator.c blender-2.61/source/creator/creator.c
---- blender-2.61.orig/source/creator/creator.c 2012-01-02 16:57:51.332355222 +0100
-+++ blender-2.61/source/creator/creator.c 2012-01-02 16:48:10.704365737 +0100
-@@ -330,14 +330,14 @@ static int end_arguments(int UNUSED(argc
- static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- G.f |= G_SCRIPT_AUTOEXEC;
-- G.f |= G_SCRIPT_OVERRIDE_PREF;
-+ G.f &= ~G_SCRIPT_OVERRIDE_PREF; /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */
- return 0;
- }
-
- static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- G.f &= ~G_SCRIPT_AUTOEXEC;
-- G.f |= G_SCRIPT_OVERRIDE_PREF;
-+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- return 0;
- }
-
diff --git a/media-gfx/blender/files/blender-2.61-collada.patch b/media-gfx/blender/files/blender-2.61-collada.patch
deleted file mode 100644
index 980b640..0000000
--- a/media-gfx/blender/files/blender-2.61-collada.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/blender/collada/SConscript 2012-01-16 19:04:02.438027832 +0100
-+++ source/blender/collada/SConscript 2012-01-16 19:03:59.787060970 +0100
-@@ -35,7 +35,7 @@
- if env['OURPLATFORM']=='darwin':
- incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
- else:
-- incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
-+ incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
-
- if env['BF_BUILDINFO']:
- defs.append('WITH_BUILDINFO')
diff --git a/media-gfx/blender/files/blender-2.61-desktop.patch b/media-gfx/blender/files/blender-2.61-desktop.patch
deleted file mode 100644
index 557ba6e..0000000
--- a/media-gfx/blender/files/blender-2.61-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- release/freedesktop/blender.desktop 2010-09-12 00:05:51.000000000 -0700
-+++ release/freedesktop/blender.desktop 2010-09-12 00:07:32.000000000 -0700
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Blender
-+Name=Blender-2.61
- GenericName=3D modeller
- GenericName[es]=modelador 3D
- GenericName[de]=3D Modellierer
-@@ -7,8 +7,8 @@
- GenericName[ru]=Редактор 3D-моделей
- Comment=3D modeling, animation, rendering and post-production
- Comment[es]=modelado 3D, animación, renderizado y post-producción
--Exec=blender
--Icon=blender
-+Exec=blender-2.61 %f
-+Icon=blender-2.61
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;
diff --git a/media-gfx/blender/files/blender-2.61-eigen.patch b/media-gfx/blender/files/blender-2.61-eigen.patch
deleted file mode 100644
index bd40ceb..0000000
--- a/media-gfx/blender/files/blender-2.61-eigen.patch
+++ /dev/null
@@ -1,543 +0,0 @@
-diff -Npur blender-2.61.orig/extern/libmv/bundle.sh blender-2.61/extern/libmv/bundle.sh
---- blender-2.61.orig/extern/libmv/bundle.sh 2011-12-20 20:22:31.563762104 +0100
-+++ blender-2.61/extern/libmv/bundle.sh 2011-12-20 20:35:09.876748698 +0100
-@@ -116,13 +116,13 @@ cat > CMakeLists.txt << EOF
-
- set(INC
- .
-- ../Eigen3
- ./third_party/ssba
- ./third_party/ldl/Include
- ../colamd/Include
- )
-
- set(INC_SYS
-+ /usr/include/eigen3
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
- )
-@@ -224,7 +224,7 @@ defs.append('GOOGLE_GLOG_DLL_DECL=')
- src = env.Glob("*.cpp")
- $src
-
--incs = '. ../Eigen3'
-+incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-
-diff -Npur blender-2.61.orig/extern/libmv/CMakeLists.txt blender-2.61/extern/libmv/CMakeLists.txt
---- blender-2.61.orig/extern/libmv/CMakeLists.txt 2011-12-20 20:22:31.545762104 +0100
-+++ blender-2.61/extern/libmv/CMakeLists.txt 2011-12-20 20:34:30.205749406 +0100
-@@ -24,13 +24,13 @@
-
- set(INC
- .
-- ../Eigen3
- third_party/ssba
- third_party/ldl/Include
- ../colamd/Include
- )
-
- set(INC_SYS
-+ /usr/include/eigen3
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
- )
-diff -Npur blender-2.61.orig/extern/libmv/SConscript blender-2.61/extern/libmv/SConscript
---- blender-2.61.orig/extern/libmv/SConscript 2011-12-20 20:22:31.545762104 +0100
-+++ blender-2.61/extern/libmv/SConscript 2011-12-20 20:31:51.516752243 +0100
-@@ -25,7 +25,7 @@ src += env.Glob('third_party/ldl/Source/
- src += env.Glob('third_party/ssba/Geometry/*.cpp')
- src += env.Glob('third_party/ssba/Math/*.cpp')
-
--incs = '. ../Eigen3'
-+incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-
-diff -Npur blender-2.61.orig/intern/itasc/CMakeLists.txt blender-2.61/intern/itasc/CMakeLists.txt
---- blender-2.61.orig/intern/itasc/CMakeLists.txt 2011-12-20 20:22:32.147762093 +0100
-+++ blender-2.61/intern/itasc/CMakeLists.txt 2011-12-20 20:27:46.428756570 +0100
-@@ -24,11 +24,11 @@
- # ***** END GPL LICENSE BLOCK *****
-
- set(INC
-- ../../extern/Eigen3
-+
- )
-
- set(INC_SYS
--
-+ /usr/include/eigen3
- )
-
- set(SRC
-@@ -121,201 +121,201 @@ set(SRC
- kdl/framevel.inl
-
- # until we have another user...
-- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h
-- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
-- ../../extern/Eigen3/Eigen/src/misc/Kernel.h
-- ../../extern/Eigen3/Eigen/src/misc/Image.h
-- ../../extern/Eigen3/Eigen/src/misc/Solve.h
-- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h
-- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
-- ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/details.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h
-- ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
-- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
-- ../../extern/Eigen3/Eigen/src/Householder/Householder.h
-- ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
-- ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
-- ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
-- ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
-- ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
-- ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
-- ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
-- ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Translation.h
-- ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Transform.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h
-- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h
-- ../../extern/Eigen3/Eigen/src/LU/Determinant.h
-- ../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
-- ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h
-- ../../extern/Eigen3/Eigen/src/LU/Inverse.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrixBase.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseVector.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/TriangularSolver.h
-- ../../extern/Eigen3/Eigen/src/Sparse/AmbiVector.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseDenseProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseBlock.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseTriangularView.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
-- ../../extern/Eigen3/Eigen/src/Sparse/CoreIterators.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrix.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseAssign.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseSparseProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseDot.h
-- ../../extern/Eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseRedux.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseFuzzy.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseView.h
-- ../../extern/Eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseUtil.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseTranspose.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/CompressedStorage.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
-- ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
-- ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h
-- ../../extern/Eigen3/Eigen/src/Core/Swap.h
-- ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
-- ../../extern/Eigen3/Eigen/src/Core/DenseBase.h
-- ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
-- ../../extern/Eigen3/Eigen/src/Core/ProductBase.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/Stride.h
-- ../../extern/Eigen3/Eigen/src/Core/Matrix.h
-- ../../extern/Eigen3/Eigen/src/Core/Visitor.h
-- ../../extern/Eigen3/Eigen/src/Core/Array.h
-- ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h
-- ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/EigenBase.h
-- ../../extern/Eigen3/Eigen/src/Core/Random.h
-- ../../extern/Eigen3/Eigen/src/Core/Redux.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/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/BooleanRedux.h
-- ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
-- ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Memory.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Meta.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Constants.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Macros.h
-- ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
-- ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
-- ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
-- ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h
-- ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h
-- ../../extern/Eigen3/Eigen/src/Core/Transpositions.h
-- ../../extern/Eigen3/Eigen/src/Core/Select.h
-- ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
-- ../../extern/Eigen3/Eigen/src/Core/Dot.h
-- ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
-- ../../extern/Eigen3/Eigen/src/Core/Product.h
-- ../../extern/Eigen3/Eigen/src/Core/Transpose.h
-- ../../extern/Eigen3/Eigen/src/Core/Block.h
-- ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
-- ../../extern/Eigen3/Eigen/src/Core/MapBase.h
-- ../../extern/Eigen3/Eigen/src/Core/NoAlias.h
-- ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
-- ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
-- ../../extern/Eigen3/Eigen/src/Core/IO.h
-- ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/Reverse.h
-- ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h
-- ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h
-- ../../extern/Eigen3/Eigen/src/Core/StableNorm.h
-- ../../extern/Eigen3/Eigen/src/Core/NumTraits.h
-- ../../extern/Eigen3/Eigen/src/Core/Map.h
-- ../../extern/Eigen3/Eigen/src/Core/Functors.h
-- ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h
-- ../../extern/Eigen3/Eigen/src/Core/NestByValue.h
-- ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
-- ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h
-- ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h
-- ../../extern/Eigen3/Eigen/src/Core/Diagonal.h
-- ../../extern/Eigen3/Eigen/src/Core/Replicate.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
-- ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
-- ../../extern/Eigen3/Eigen/src/Core/Assign.h
-- ../../extern/Eigen3/Eigen/src/Core/Flagged.h
-- ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h
-- ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
-+ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/BlockMethods.h
-+ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
-+ /usr/include/eigen3/Eigen/src/misc/Kernel.h
-+ /usr/include/eigen3/Eigen/src/misc/Image.h
-+ /usr/include/eigen3/Eigen/src/misc/Solve.h
-+ /usr/include/eigen3/Eigen/src/QR/HouseholderQR.h
-+ /usr/include/eigen3/Eigen/src/QR/ColPivHouseholderQR.h
-+ /usr/include/eigen3/Eigen/src/QR/FullPivHouseholderQR.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/details.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/StdList.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/StdDeque.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/StdVector.h
-+ /usr/include/eigen3/Eigen/src/SVD/UpperBidiagonalization.h
-+ /usr/include/eigen3/Eigen/src/SVD/JacobiSVD.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/RealSchur.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Jacobi/Jacobi.h
-+ /usr/include/eigen3/Eigen/src/Householder/Householder.h
-+ /usr/include/eigen3/Eigen/src/Householder/BlockHouseholder.h
-+ /usr/include/eigen3/Eigen/src/Householder/HouseholderSequence.h
-+ /usr/include/eigen3/Eigen/src/Geometry/RotationBase.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Rotation2D.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Homogeneous.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Hyperplane.h
-+ /usr/include/eigen3/Eigen/src/Geometry/EulerAngles.h
-+ /usr/include/eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
-+ /usr/include/eigen3/Eigen/src/Geometry/ParametrizedLine.h
-+ /usr/include/eigen3/Eigen/src/Geometry/OrthoMethods.h
-+ /usr/include/eigen3/Eigen/src/Geometry/AngleAxis.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Umeyama.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Scaling.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Translation.h
-+ /usr/include/eigen3/Eigen/src/Geometry/AlignedBox.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Transform.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Quaternion.h
-+ /usr/include/eigen3/Eigen/src/LU/PartialPivLU.h
-+ /usr/include/eigen3/Eigen/src/LU/Determinant.h
-+ /usr/include/eigen3/Eigen/src/LU/arch/Inverse_SSE.h
-+ /usr/include/eigen3/Eigen/src/LU/FullPivLU.h
-+ /usr/include/eigen3/Eigen/src/LU/Inverse.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrixBase.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseVector.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/TriangularSolver.h
-+ /usr/include/eigen3/Eigen/src/Sparse/AmbiVector.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseDenseProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseBlock.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseTriangularView.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
-+ /usr/include/eigen3/Eigen/src/Sparse/CoreIterators.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrix.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseAssign.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseSparseProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseDot.h
-+ /usr/include/eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseRedux.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseFuzzy.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseView.h
-+ /usr/include/eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseUtil.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseTranspose.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/CompressedStorage.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Cwise.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/QR.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Lazy.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Memory.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/SVD.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/VectorBlock.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Meta.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Macros.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/LeastSquares.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/LU.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Block.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/All.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Minor.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/MathFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/SelfAdjointView.h
-+ /usr/include/eigen3/Eigen/src/Core/MatrixBase.h
-+ /usr/include/eigen3/Eigen/src/Core/Swap.h
-+ /usr/include/eigen3/Eigen/src/Core/DenseCoeffsBase.h
-+ /usr/include/eigen3/Eigen/src/Core/DenseBase.h
-+ /usr/include/eigen3/Eigen/src/Core/GlobalFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/ProductBase.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseBinaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/Stride.h
-+ /usr/include/eigen3/Eigen/src/Core/Matrix.h
-+ /usr/include/eigen3/Eigen/src/Core/Visitor.h
-+ /usr/include/eigen3/Eigen/src/Core/Array.h
-+ /usr/include/eigen3/Eigen/src/Core/ReturnByValue.h
-+ /usr/include/eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/EigenBase.h
-+ /usr/include/eigen3/Eigen/src/Core/Random.h
-+ /usr/include/eigen3/Eigen/src/Core/Redux.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/Default/Settings.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/NEON/Complex.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/Complex.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/BooleanRedux.h
-+ /usr/include/eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
-+ /usr/include/eigen3/Eigen/src/Core/util/BlasUtil.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Memory.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Meta.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Constants.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Macros.h
-+ /usr/include/eigen3/Eigen/src/Core/util/ForwardDeclarations.h
-+ /usr/include/eigen3/Eigen/src/Core/util/StaticAssert.h
-+ /usr/include/eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
-+ /usr/include/eigen3/Eigen/src/Core/util/XprHelper.h
-+ /usr/include/eigen3/Eigen/src/Core/VectorBlock.h
-+ /usr/include/eigen3/Eigen/src/Core/Transpositions.h
-+ /usr/include/eigen3/Eigen/src/Core/Select.h
-+ /usr/include/eigen3/Eigen/src/Core/BandMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryView.h
-+ /usr/include/eigen3/Eigen/src/Core/Dot.h
-+ /usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/Product.h
-+ /usr/include/eigen3/Eigen/src/Core/Transpose.h
-+ /usr/include/eigen3/Eigen/src/Core/Block.h
-+ /usr/include/eigen3/Eigen/src/Core/ArrayWrapper.h
-+ /usr/include/eigen3/Eigen/src/Core/MapBase.h
-+ /usr/include/eigen3/Eigen/src/Core/NoAlias.h
-+ /usr/include/eigen3/Eigen/src/Core/ForceAlignedAccess.h
-+ /usr/include/eigen3/Eigen/src/Core/PlainObjectBase.h
-+ /usr/include/eigen3/Eigen/src/Core/IO.h
-+ /usr/include/eigen3/Eigen/src/Core/DiagonalMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/Reverse.h
-+ /usr/include/eigen3/Eigen/src/Core/Fuzzy.h
-+ /usr/include/eigen3/Eigen/src/Core/DenseStorage.h
-+ /usr/include/eigen3/Eigen/src/Core/StableNorm.h
-+ /usr/include/eigen3/Eigen/src/Core/NumTraits.h
-+ /usr/include/eigen3/Eigen/src/Core/Map.h
-+ /usr/include/eigen3/Eigen/src/Core/Functors.h
-+ /usr/include/eigen3/Eigen/src/Core/PermutationMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/ArrayBase.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseNullaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/SolveTriangular.h
-+ /usr/include/eigen3/Eigen/src/Core/NestByValue.h
-+ /usr/include/eigen3/Eigen/src/Core/DiagonalProduct.h
-+ /usr/include/eigen3/Eigen/src/Core/CommaInitializer.h
-+ /usr/include/eigen3/Eigen/src/Core/MathFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/Diagonal.h
-+ /usr/include/eigen3/Eigen/src/Core/Replicate.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointProduct.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/Parallelizer.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
-+ /usr/include/eigen3/Eigen/src/Core/TriangularMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/VectorwiseOp.h
-+ /usr/include/eigen3/Eigen/src/Core/Assign.h
-+ /usr/include/eigen3/Eigen/src/Core/Flagged.h
-+ /usr/include/eigen3/Eigen/src/Cholesky/LDLT.h
-+ /usr/include/eigen3/Eigen/src/Cholesky/LLT.h
- )
-
- if(WIN32)
-diff -Npur blender-2.61.orig/intern/itasc/SConscript blender-2.61/intern/itasc/SConscript
---- blender-2.61.orig/intern/itasc/SConscript 2011-12-20 20:22:32.147762093 +0100
-+++ blender-2.61/intern/itasc/SConscript 2011-12-20 20:23:36.948760947 +0100
-@@ -5,7 +5,7 @@ sources = env.Glob('*.cpp')
- sources += env.Glob('kdl/*.cpp')
- sources += env.Glob('kdl/utilities/*.cpp')
-
--incs = '. ../../extern/Eigen3'
-+incs = '. /usr/include/eigen3'
-
- defs = []
-
-diff -Npur blender-2.61.orig/source/blender/ikplugin/CMakeLists.txt blender-2.61/source/blender/ikplugin/CMakeLists.txt
---- blender-2.61.orig/source/blender/ikplugin/CMakeLists.txt 2011-12-20 20:22:32.116762096 +0100
-+++ blender-2.61/source/blender/ikplugin/CMakeLists.txt 2011-12-20 20:29:42.547754494 +0100
-@@ -49,9 +49,11 @@ set(SRC
- if(WITH_IK_ITASC)
- add_definitions(-DWITH_IK_ITASC)
- list(APPEND INC
-- ../../../extern/Eigen3
- ../../../intern/itasc
- )
-+ list(APPEND INC_SYS
-+ /usr/include/eigen3
-+ )
- list(APPEND SRC
- intern/itasc_plugin.cpp
- )
-diff -Npur blender-2.61.orig/source/blender/ikplugin/SConscript blender-2.61/source/blender/ikplugin/SConscript
---- blender-2.61.orig/source/blender/ikplugin/SConscript 2011-12-20 20:22:32.116762096 +0100
-+++ blender-2.61/source/blender/ikplugin/SConscript 2011-12-20 20:24:26.328760105 +0100
-@@ -4,7 +4,7 @@ defs = []
- sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
-
- incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
--incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3'
-+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen3'
-
- defs.append('WITH_IK_ITASC')
-
-diff -Npur blender-2.61.orig/source/gameengine/Converter/CMakeLists.txt blender-2.61/source/gameengine/Converter/CMakeLists.txt
---- blender-2.61.orig/source/gameengine/Converter/CMakeLists.txt 2011-12-20 20:22:31.708762102 +0100
-+++ blender-2.61/source/gameengine/Converter/CMakeLists.txt 2011-12-20 20:28:50.404755406 +0100
-@@ -50,7 +50,6 @@ set(INC
- ../../blender/makesrna
- ../../blender/windowmanager
- ../../../extern/bullet2/src
-- ../../../extern/Eigen3
- ../../../intern/container
- ../../../intern/guardedalloc
- ../../../intern/moto/include
-@@ -59,7 +58,7 @@ set(INC
- )
-
- set(INC_SYS
--
-+ /usr/include/eigen3
- )
-
- set(SRC
-diff -Npur blender-2.61.orig/source/gameengine/Converter/SConscript blender-2.61/source/gameengine/Converter/SConscript
---- blender-2.61.orig/source/gameengine/Converter/SConscript 2011-12-20 20:22:31.708762102 +0100
-+++ blender-2.61/source/gameengine/Converter/SConscript 2011-12-20 20:25:17.397759112 +0100
-@@ -21,7 +21,7 @@ incs += ' #source/blender/windowmanager'
- incs += ' #source/blender/makesrna'
- incs += ' #source/blender/ikplugin'
- incs += ' #extern/recastnavigation/Detour/Include'
--incs += ' #extern/Eigen3'
-+incs += ' /usr/include/eigen3'
-
- incs += ' ' + env['BF_BULLET_INC']
-
diff --git a/media-gfx/blender/files/blender-2.61-enable_site_module.patch b/media-gfx/blender/files/blender-2.61-enable_site_module.patch
deleted file mode 100644
index b913acd..0000000
--- a/media-gfx/blender/files/blender-2.61-enable_site_module.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- source/blender/python/intern/bpy_interface.c-original 2011-12-15 23:01:09.059429414 +0100
-+++ source/blender/python/intern/bpy_interface.c 2011-12-15 23:01:17.312478333 +0100
-@@ -219,10 +219,6 @@
- * blender is utf-8 too - campbell */
- BLI_setenv("PYTHONIOENCODING", "utf-8:surrogateescape");
-
-- /* Python 3.2 now looks for '2.xx/python/include/python3.2d/pyconfig.h' to
-- * parse from the 'sysconfig' module which is used by 'site',
-- * so for now disable site. alternatively we could copy the file. */
-- Py_NoSiteFlag= 1;
-
- Py_Initialize();
-
---- source/gameengine/Ketsji/KX_PythonInit.cpp-original 2011-12-15 23:01:05.043919062 +0100
-+++ source/gameengine/Ketsji/KX_PythonInit.cpp 2011-12-15 23:01:23.926318921 +0100
-@@ -1823,7 +1823,6 @@
- STR_String pname = progname;
- Py_SetProgramName(pname.Ptr());
- #endif
-- Py_NoSiteFlag=1;
- Py_FrozenFlag=1;
-
- /* must run before python initializes */
-@@ -1896,7 +1895,6 @@
- STR_String pname = progname;
- Py_SetProgramName(pname.Ptr());
- #endif
-- Py_NoSiteFlag=1;
- Py_FrozenFlag=1;
-
- initPyTypes();
diff --git a/media-gfx/blender/files/blender-2.61-glew.patch b/media-gfx/blender/files/blender-2.61-glew.patch
deleted file mode 100644
index 365fc08..0000000
--- a/media-gfx/blender/files/blender-2.61-glew.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- extern/SConscript-original 2011-12-15 16:25:29.379238136 +0100
-+++ extern/SConscript 2011-12-15 16:26:10.376448670 +0100
-@@ -2,7 +2,6 @@
-
- Import('env')
-
--SConscript(['glew/SConscript'])
- SConscript(['colamd/SConscript'])
-
- if env['WITH_BF_GAMEENGINE']:
---- source/blender/editors/include/BIF_gl.h-original 2011-12-15 16:27:31.299733603 +0100
-+++ source/blender/editors/include/BIF_gl.h 2011-12-15 16:30:50.993113607 +0100
-@@ -33,7 +33,7 @@
- #ifndef BIF_GL_H
- #define BIF_GL_H
-
--#include "GL/glew.h"
-+#include <GL/glew.h>
-
- /*
- * these should be phased out. cpack should be replaced in
---- extern/CMakeLists.txt-original 2011-12-15 16:26:50.104497900 +0100
-+++ extern/CMakeLists.txt 2011-12-15 16:28:04.397940215 +0100
-@@ -40,9 +40,6 @@
- add_subdirectory(binreloc)
- endif()
-
--if(WITH_BUILTIN_GLEW)
-- add_subdirectory(glew)
--endif()
-
- if(WITH_GAMEENGINE)
- add_subdirectory(recastnavigation)
---- CMakeLists.txt-original 2011-12-15 16:27:03.309176149 +0100
-+++ CMakeLists.txt 2011-12-15 16:29:02.001261302 +0100
-@@ -156,7 +156,7 @@
-
- if(UNIX AND NOT APPLE)
- option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
-- option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
-+ option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" OFF)
- option(WITH_XDG_USER_DIRS "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
- mark_as_advanced(WITH_XDG_USER_DIRS)
- else()
diff --git a/media-gfx/blender/files/blender-2.61-insecure.desktop b/media-gfx/blender/files/blender-2.61-insecure.desktop
deleted file mode 100644
index 498f303..0000000
--- a/media-gfx/blender/files/blender-2.61-insecure.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Blender-2.61 (reduced security)
-GenericName=3D modeller (reduced security)
-GenericName[es]=modelador 3D (reduced security)
-GenericName[de]=3D Modellierer (weniger Sicherheit)
-GenericName[fr]=modeleur 3D (reduced security)
-GenericName[ru]=Редактор 3D-моделей (reduced security)
-Comment=3D modeling, animation, rendering and post-production
-Comment[es]=modelado 3D, animación, renderizado y post-producción
-Exec=blender-2.61 --enable-autoexec %f
-Icon=blender-2.61
-Terminal=false
-Type=Application
-Categories=Graphics;3DGraphics;
-MimeType=application/x-blender;
diff --git a/media-gfx/blender/files/blender-2.61-opencollada-debug.patch b/media-gfx/blender/files/blender-2.61-opencollada-debug.patch
deleted file mode 100644
index 0310c47..0000000
--- a/media-gfx/blender/files/blender-2.61-opencollada-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Npur blender-2.61.orig/build_files/scons/tools/Blender.py blender-2.61/build_files/scons/tools/Blender.py
---- blender-2.61.orig/build_files/scons/tools/Blender.py 2012-02-08 22:33:29.133700566 +0100
-+++ blender-2.61/build_files/scons/tools/Blender.py 2012-02-08 22:35:13.459698722 +0100
-@@ -276,10 +276,7 @@ def setup_syslibs(lenv):
- syslibs += Split(lenv['BF_PTHREADS_LIB'])
- if lenv['WITH_BF_COLLADA']:
- syslibs.append(lenv['BF_PCRE_LIB'])
-- if lenv['BF_DEBUG']:
-- syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])]
-- else:
-- syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
-+ syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
- syslibs.append(lenv['BF_EXPAT_LIB'])
- if lenv['WITH_BF_COLAMD']:
- syslibs += Split(lenv['BF_COLAMD_LIB'])
diff --git a/media-gfx/blender/files/blender-2.62-CVE-2009-3850-v4.patch b/media-gfx/blender/files/blender-2.62-CVE-2009-3850-v4.patch
deleted file mode 100644
index 956eb50..0000000
--- a/media-gfx/blender/files/blender-2.62-CVE-2009-3850-v4.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -Npur blender-2.61.orig/SConstruct blender-2.61/SConstruct
---- blender-2.61.orig/SConstruct 2012-01-02 16:57:51.329355164 +0100
-+++ blender-2.61/SConstruct 2012-01-02 17:04:36.232349086 +0100
-@@ -346,6 +346,10 @@ if 'blenderplayer' in B.targets:
- if 'blendernogame' in B.targets:
- env['WITH_BF_GAMEENGINE'] = False
-
-+# build without python autoexec security?
-+if env['WITH_PYTHON_SECURITY'] == True:
-+ env.Append(CPPFLAGS=['-DWITH_PYTHON_SECURITY'])
-+
- # build without elbeem (fluidsim)?
- if env['WITH_BF_FLUID'] == 1:
- env['CPPFLAGS'].append('-DWITH_MOD_FLUID')
-diff -Npur blender-2.61.orig/build_files/scons/tools/btools.py blender-2.61/build_files/scons/tools/btools.py
---- blender-2.61.orig/build_files/scons/tools/btools.py 2012-01-02 16:56:21.351357062 +0100
-+++ blender-2.61/build_files/scons/tools/btools.py 2012-01-02 17:01:37.760350726 +0100
-@@ -96,7 +96,7 @@ def print_arguments(args, bc):
-
- def validate_arguments(args, bc):
- opts_list = [
-- 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS',
-+ 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', 'WITH_PYTHON_SECURITY',
- 'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
- 'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
- 'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH',
-@@ -256,6 +256,7 @@ def read_opts(env, cfg, args):
- (BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)),
- (BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)),
- ('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),
-+ (BoolVariable('WITH_PYTHON_SECURITY', 'Disables execution of scripts within blend files by default (recommend to leave off)', False)),
-
- (BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)),
- (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)),
-diff -Npur blender-2.61.orig/source/blender/blenkernel/intern/blender.c blender-2.61/source/blender/blenkernel/intern/blender.c
---- blender-2.61.orig/source/blender/blenkernel/intern/blender.c 2012-01-02 16:57:51.329355164 +0100
-+++ blender-2.61/source/blender/blenkernel/intern/blender.c 2012-01-02 16:48:10.700365736 +0100
-@@ -144,6 +144,7 @@ void initglobals(void)
- G.f |= G_SCRIPT_AUTOEXEC;
- #else
- G.f &= ~G_SCRIPT_AUTOEXEC;
-+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- #endif
- }
-
-diff -Npur blender-2.61.orig/source/blender/makesrna/intern/rna_userdef.c blender-2.61/source/blender/makesrna/intern/rna_userdef.c
---- blender-2.61.orig/source/blender/makesrna/intern/rna_userdef.c 2012-01-02 16:57:51.330355184 +0100
-+++ blender-2.61/source/blender/makesrna/intern/rna_userdef.c 2012-01-02 16:48:10.701365735 +0100
-@@ -114,9 +114,17 @@ static void rna_userdef_show_manipulator
-
- static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
- {
-- UserDef *userdef = (UserDef*)ptr->data;
-- if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC;
-- else G.f |= G_SCRIPT_AUTOEXEC;
-+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+ /* Blender run with --enable-autoexec */
-+ UserDef *userdef = (UserDef*)ptr->data;
-+ if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC;
-+ else G.f |= G_SCRIPT_AUTOEXEC;
-+ }
-+}
-+
-+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) {
-+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+ return !(G.f & G_SCRIPT_OVERRIDE_PREF);
- }
-
- static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr)
-@@ -2729,6 +2737,8 @@ static void rna_def_userdef_system(Blend
- "Allow any .blend file to run scripts automatically "
- "(unsafe with blend files from an untrusted source)");
- RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update");
-+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+ RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable");
-
- prop= RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE);
-diff -Npur blender-2.61.orig/source/blender/windowmanager/intern/wm_files.c blender-2.61/source/blender/windowmanager/intern/wm_files.c
---- blender-2.61.orig/source/blender/windowmanager/intern/wm_files.c 2012-01-02 16:57:51.330355184 +0100
-+++ blender-2.61/source/blender/windowmanager/intern/wm_files.c 2012-01-02 16:48:10.702365735 +0100
-@@ -286,13 +286,18 @@ static void wm_init_userdef(bContext *C)
-
- /* set the python auto-execute setting from user prefs */
- /* enabled by default, unless explicitly enabled in the command line which overrides */
-- if((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+ if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) {
-+ /* Blender run with --enable-autoexec */
- if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |= G_SCRIPT_AUTOEXEC;
- else G.f &= ~G_SCRIPT_AUTOEXEC;
- }
-
- /* update tempdir from user preferences */
- BLI_init_temporary_dir(U.tempdir);
-+
-+ /* Workaround to fix default of "Auto Run Python Scripts" checkbox */
-+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC))
-+ U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE;
- }
-
-
-diff -Npur blender-2.61.orig/source/blender/windowmanager/intern/wm_operators.c blender-2.61/source/blender/windowmanager/intern/wm_operators.c
---- blender-2.61.orig/source/blender/windowmanager/intern/wm_operators.c 2012-01-02 16:57:51.331355194 +0100
-+++ blender-2.61/source/blender/windowmanager/intern/wm_operators.c 2012-01-02 16:48:10.703365736 +0100
-@@ -1601,12 +1601,13 @@ static int wm_open_mainfile_exec(bContex
- G.fileflags &= ~G_FILE_NO_UI;
- else
- G.fileflags |= G_FILE_NO_UI;
--
-- if(RNA_boolean_get(op->ptr, "use_scripts"))
-+
-+ /* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */
-+ if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF)))
- G.f |= G_SCRIPT_AUTOEXEC;
- else
- G.f &= ~G_SCRIPT_AUTOEXEC;
--
-+
- // XXX wm in context is not set correctly after WM_read_file -> crash
- // do it before for now, but is this correct with multiple windows?
- WM_event_add_notifier(C, NC_WINDOW, NULL);
-@@ -1618,6 +1619,8 @@ static int wm_open_mainfile_exec(bContex
-
- static void WM_OT_open_mainfile(wmOperatorType *ot)
- {
-+ PropertyRNA * use_scripts_checkbox = NULL;
-+
- ot->name= "Open Blender File";
- ot->idname= "WM_OT_open_mainfile";
- ot->description="Open a Blender file";
-@@ -1629,7 +1632,12 @@ static void WM_OT_open_mainfile(wmOperat
- WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH);
-
- RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file");
-- RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", "Allow blend file execute scripts automatically, default available from system preferences");
-+ use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts",
-+ !!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source",
-+ "Allow blend file execute scripts automatically, default available from system preferences");
-+ /* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */
-+ if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF))
-+ RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE);
- }
-
- /* **************** link/append *************** */
-diff -Npur blender-2.61.orig/source/creator/creator.c blender-2.61/source/creator/creator.c
---- blender-2.61.orig/source/creator/creator.c 2012-01-02 16:57:51.332355222 +0100
-+++ blender-2.61/source/creator/creator.c 2012-01-02 16:48:10.704365737 +0100
-@@ -330,14 +330,14 @@ static int end_arguments(int UNUSED(argc
- static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- G.f |= G_SCRIPT_AUTOEXEC;
-- G.f |= G_SCRIPT_OVERRIDE_PREF;
-+ G.f &= ~G_SCRIPT_OVERRIDE_PREF; /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */
- return 0;
- }
-
- static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- G.f &= ~G_SCRIPT_AUTOEXEC;
-- G.f |= G_SCRIPT_OVERRIDE_PREF;
-+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- return 0;
- }
-
diff --git a/media-gfx/blender/files/blender-2.62-colamd.patch b/media-gfx/blender/files/blender-2.62-colamd.patch
deleted file mode 100644
index fa5b017..0000000
--- a/media-gfx/blender/files/blender-2.62-colamd.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-diff -Npur blender-2.62.orig/build_files/scons/config/linux-config.py blender-2.62/build_files/scons/config/linux-config.py
---- blender-2.62.orig/build_files/scons/config/linux-config.py 2012-02-17 15:07:36.195375776 +0100
-+++ blender-2.62/build_files/scons/config/linux-config.py 2012-02-17 15:10:44.225372456 +0100
-@@ -193,6 +193,11 @@ BF_EXPAT = '/usr'
- BF_EXPAT_LIB = 'expat'
- BF_EXPAT_LIBPATH = '/usr/lib'
-
-+WITH_BF_COLAMD = True
-+BF_COLAMD = '#extern/colamd'
-+BF_COLAMD_INC = '${BF_COLAMD}/include'
-+BF_COLAMD_LIB = 'extern_colamd'
-+
- WITH_BF_JEMALLOC = False
- WITH_BF_STATICJEMALLOC = False
- BF_JEMALLOC = '/usr'
-diff -Npur blender-2.62.orig/build_files/scons/tools/Blender.py blender-2.62/build_files/scons/tools/Blender.py
---- blender-2.62.orig/build_files/scons/tools/Blender.py 2012-02-17 15:07:36.195375776 +0100
-+++ blender-2.62/build_files/scons/tools/Blender.py 2012-02-17 15:15:26.704367444 +0100
-@@ -281,6 +281,8 @@ def setup_syslibs(lenv):
- else:
- syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
- syslibs.append(lenv['BF_EXPAT_LIB'])
-+ if lenv['WITH_BF_COLAMD']:
-+ syslibs += Split(lenv['BF_COLAMD_LIB'])
-
- if lenv['WITH_BF_JEMALLOC']:
- if not lenv['WITH_BF_STATICJEMALLOC']:
-diff -Npur blender-2.62.orig/build_files/scons/tools/btools.py blender-2.62/build_files/scons/tools/btools.py
---- blender-2.62.orig/build_files/scons/tools/btools.py 2012-02-17 15:07:36.195375776 +0100
-+++ blender-2.62/build_files/scons/tools/btools.py 2012-02-17 15:10:44.226372453 +0100
-@@ -125,6 +125,7 @@ def validate_arguments(args, bc):
- 'WITH_BF_FFTW3', 'BF_FFTW3', 'BF_FFTW3_INC', 'BF_FFTW3_LIB', 'BF_FFTW3_LIBPATH', 'WITH_BF_STATICFFTW3', 'BF_FFTW3_LIB_STATIC',
- 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC',
- 'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_INC', 'BF_OPENCOLLADA_LIB', 'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH', 'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH',
-+ 'WITH_BF_COLAMD', 'BF_COLAMD', 'BF_COLAMD_INC', 'BF_COLAMD_LIB',
- 'WITH_BF_PLAYER',
- 'WITH_BF_NOBLENDER',
- 'WITH_BF_BINRELOC',
-@@ -450,6 +451,11 @@ def read_opts(env, cfg, args):
- ('BF_EXPAT_LIB', 'Expat library', ''),
- ('BF_EXPAT_LIBPATH', 'Expat library path', ''),
-
-+ (BoolVariable('WITH_BF_COLAMD', 'Use Colamd if true', True)),
-+ ('BF_COLAMD', 'Colamd base dir', ''),
-+ ('BF_COLAMD_INC', 'Colamd include path', ''),
-+ ('BF_COLAMD_LIB', 'Colamd library', ''),
-+
- (BoolVariable('WITH_BF_JEMALLOC', 'Use jemalloc if true', False)),
- (BoolVariable('WITH_BF_STATICJEMALLOC', 'Staticly link to jemalloc', False)),
- ('BF_JEMALLOC', 'jemalloc base path', ''),
-diff -Npur blender-2.62.orig/extern/CMakeLists.txt blender-2.62/extern/CMakeLists.txt
---- blender-2.62.orig/extern/CMakeLists.txt 2012-02-17 15:07:36.192375776 +0100
-+++ blender-2.62/extern/CMakeLists.txt 2012-02-17 15:10:44.226372453 +0100
-@@ -26,8 +26,6 @@
- # Otherwise we get warnings here that we cant fix in external projects
- remove_strict_flags()
-
--add_subdirectory(colamd)
--
- if(WITH_MOD_CLOTH_ELTOPO)
- add_subdirectory(eltopo)
- endif()
-diff -Npur blender-2.62.orig/extern/libmv/bundle.sh blender-2.62/extern/libmv/bundle.sh
---- blender-2.62.orig/extern/libmv/bundle.sh 2012-02-17 15:07:36.187375776 +0100
-+++ blender-2.62/extern/libmv/bundle.sh 2012-02-17 15:13:16.904369765 +0100
-@@ -121,13 +121,13 @@ set(INC
- .
- third_party/ssba
- third_party/ldl/Include
-- ../colamd/Include
- )
-
- set(INC_SYS
- /usr/include/eigen3
- \${PNG_INCLUDE_DIR}
- \${ZLIB_INCLUDE_DIRS}
-+ \${COLAMD_INCLUDE_DIRS}
- )
-
- set(SRC
-@@ -233,6 +233,7 @@ $src
- incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-+incs += ' ' + env['BF_COLAMD_INC']
-
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
-@@ -262,7 +263,7 @@ else:
- ccflags_libmv += Split(env['REL_CCFLAGS'])
- cxxflags_libmv += Split(env['REL_CXXFLAGS'])
-
--incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
-+incs += ' ./third_party/ssba ./third_party/ldl/Include'
-
- env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
- EOF
-diff -Npur blender-2.62.orig/extern/libmv/CMakeLists.txt blender-2.62/extern/libmv/CMakeLists.txt
---- blender-2.62.orig/extern/libmv/CMakeLists.txt 2012-02-17 15:07:36.183375777 +0100
-+++ blender-2.62/extern/libmv/CMakeLists.txt 2012-02-17 15:10:44.226372453 +0100
-@@ -30,13 +30,13 @@ set(INC
- .
- third_party/ssba
- third_party/ldl/Include
-- ../colamd/Include
- )
-
- set(INC_SYS
- /usr/include/eigen3
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
-+ ${COLAMD_INCLUDE_DIRS}
- )
-
- set(SRC
-diff -Npur blender-2.62.orig/extern/libmv/SConscript blender-2.62/extern/libmv/SConscript
---- blender-2.62.orig/extern/libmv/SConscript 2012-02-17 15:07:36.183375777 +0100
-+++ blender-2.62/extern/libmv/SConscript 2012-02-17 15:10:44.226372453 +0100
-@@ -33,6 +33,7 @@ src += env.Glob('third_party/ssba/Math/*
- incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-+incs += ' ' + env['BF_COLAMD_INC']
-
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
-@@ -62,6 +63,6 @@ else:
- ccflags_libmv += Split(env['REL_CCFLAGS'])
- cxxflags_libmv += Split(env['REL_CXXFLAGS'])
-
--incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
-+incs += ' ./third_party/ssba ./third_party/ldl/Include'
-
- env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
-diff -Npur blender-2.62.orig/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp blender-2.62/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
---- blender-2.62.orig/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-02-17 15:07:36.184375777 +0100
-+++ blender-2.62/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-02-17 15:10:44.227372449 +0100
-@@ -21,7 +21,7 @@ with SSBA. If not, see <http://www.gnu.o
-
- #if defined(V3DLIB_ENABLE_SUITESPARSE)
- //# include "COLAMD/Include/colamd.h"
--# include "colamd.h"
-+# include <colamd.h>
- extern "C"
- {
- //# include "LDL/Include/ldl.h"
-diff -Npur blender-2.62.orig/extern/SConscript blender-2.62/extern/SConscript
---- blender-2.62.orig/extern/SConscript 2012-02-17 15:07:36.191375776 +0100
-+++ blender-2.62/extern/SConscript 2012-02-17 15:10:44.227372449 +0100
-@@ -2,8 +2,6 @@
-
- Import('env')
-
--SConscript(['colamd/SConscript'])
--
- if env['WITH_BF_GAMEENGINE']:
- SConscript(['recastnavigation/SConscript'])
-
-diff -Npur blender-2.62.orig/intern/opennl/CMakeLists.txt blender-2.62/intern/opennl/CMakeLists.txt
---- blender-2.62.orig/intern/opennl/CMakeLists.txt 2012-02-17 15:07:36.326375774 +0100
-+++ blender-2.62/intern/opennl/CMakeLists.txt 2012-02-17 15:10:44.227372449 +0100
-@@ -40,11 +40,10 @@ add_definitions(
- set(INC
- extern
- superlu
-- ../../extern/colamd/Include
- )
-
- set(INC_SYS
--
-+ /usr/include
- )
-
- set(SRC
-diff -Npur blender-2.62.orig/intern/opennl/SConscript blender-2.62/intern/opennl/SConscript
---- blender-2.62.orig/intern/opennl/SConscript 2012-02-17 15:07:36.319375774 +0100
-+++ blender-2.62/intern/opennl/SConscript 2012-02-17 15:10:44.227372449 +0100
-@@ -3,7 +3,7 @@ Import ('env')
-
- sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c')
-
--incs = 'extern superlu ../../extern/colamd/Include'
-+incs = 'extern superlu /usr/include'
-
- if (env['OURPLATFORM'] == 'win32-mingw'):
- env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
-diff -Npur blender-2.62.orig/intern/opennl/superlu/get_perm_c.c blender-2.62/intern/opennl/superlu/get_perm_c.c
---- blender-2.62.orig/intern/opennl/superlu/get_perm_c.c 2012-02-17 15:07:36.319375774 +0100
-+++ blender-2.62/intern/opennl/superlu/get_perm_c.c 2012-02-17 15:10:44.227372449 +0100
-@@ -10,7 +10,7 @@
- */
-
- #include "ssp_defs.h"
--#include "colamd.h"
-+#include <colamd.h>
-
- extern int genmmd_(int *, int *, int *, int *, int *, int *, int *,
- int *, int *, int *, int *, int *);
diff --git a/media-gfx/blender/files/blender-2.62-collada.patch b/media-gfx/blender/files/blender-2.62-collada.patch
deleted file mode 100644
index 980b640..0000000
--- a/media-gfx/blender/files/blender-2.62-collada.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/blender/collada/SConscript 2012-01-16 19:04:02.438027832 +0100
-+++ source/blender/collada/SConscript 2012-01-16 19:03:59.787060970 +0100
-@@ -35,7 +35,7 @@
- if env['OURPLATFORM']=='darwin':
- incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
- else:
-- incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
-+ incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
-
- if env['BF_BUILDINFO']:
- defs.append('WITH_BUILDINFO')
diff --git a/media-gfx/blender/files/blender-2.62-desktop.patch b/media-gfx/blender/files/blender-2.62-desktop.patch
deleted file mode 100644
index f3a715b..0000000
--- a/media-gfx/blender/files/blender-2.62-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- release/freedesktop/blender.desktop 2010-09-12 00:05:51.000000000 -0700
-+++ release/freedesktop/blender.desktop 2010-09-12 00:07:32.000000000 -0700
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Blender
-+Name=Blender-2.62
- GenericName=3D modeller
- GenericName[es]=modelador 3D
- GenericName[de]=3D Modellierer
-@@ -7,8 +7,8 @@
- GenericName[ru]=Редактор 3D-моделей
- Comment=3D modeling, animation, rendering and post-production
- Comment[es]=modelado 3D, animación, renderizado y post-producción
--Exec=blender
--Icon=blender
-+Exec=blender-2.62 %f
-+Icon=blender-2.62
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;
diff --git a/media-gfx/blender/files/blender-2.62-doxyfile.patch b/media-gfx/blender/files/blender-2.62-doxyfile.patch
deleted file mode 100644
index c52c234..0000000
--- a/media-gfx/blender/files/blender-2.62-doxyfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- blender-2.60a.orig/work/blender-2.60a/doc/doxygen/Doxyfile 2012-02-12 23:05:35.390883778 +0100
-+++ blender-2.60a/work/blender-2.60a/doc/doxygen/Doxyfile 2012-02-12 23:07:22.539860341 +0100
-@@ -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.62-eigen.patch b/media-gfx/blender/files/blender-2.62-eigen.patch
deleted file mode 100644
index 2561fb7..0000000
--- a/media-gfx/blender/files/blender-2.62-eigen.patch
+++ /dev/null
@@ -1,555 +0,0 @@
-diff -Npur blender-2.62.orig/extern/libmv/bundle.sh blender-2.62/extern/libmv/bundle.sh
---- blender-2.62.orig/extern/libmv/bundle.sh 2012-02-17 14:50:37.259393790 +0100
-+++ blender-2.62/extern/libmv/bundle.sh 2012-02-17 14:52:22.732391920 +0100
-@@ -119,13 +119,13 @@ cat > CMakeLists.txt << EOF
-
- set(INC
- .
-- ../Eigen3
- third_party/ssba
- third_party/ldl/Include
- ../colamd/Include
- )
-
- set(INC_SYS
-+ /usr/include/eigen3
- \${PNG_INCLUDE_DIR}
- \${ZLIB_INCLUDE_DIRS}
- )
-@@ -230,7 +230,7 @@ defs.append('GOOGLE_GLOG_DLL_DECL=')
- src = env.Glob("*.cpp")
- $src
-
--incs = '. ../Eigen3'
-+incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-
-diff -Npur blender-2.62.orig/extern/libmv/CMakeLists.txt blender-2.62/extern/libmv/CMakeLists.txt
---- blender-2.62.orig/extern/libmv/CMakeLists.txt 2012-02-17 14:50:37.255393790 +0100
-+++ blender-2.62/extern/libmv/CMakeLists.txt 2012-02-17 14:51:01.456393374 +0100
-@@ -28,13 +28,13 @@
-
- set(INC
- .
-- ../Eigen3
- third_party/ssba
- third_party/ldl/Include
- ../colamd/Include
- )
-
- set(INC_SYS
-+ /usr/include/eigen3
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
- )
-diff -Npur blender-2.62.orig/extern/libmv/SConscript blender-2.62/extern/libmv/SConscript
---- blender-2.62.orig/extern/libmv/SConscript 2012-02-17 14:50:37.255393790 +0100
-+++ blender-2.62/extern/libmv/SConscript 2012-02-17 14:51:01.456393374 +0100
-@@ -30,7 +30,7 @@ src += env.Glob('third_party/ldl/Source/
- src += env.Glob('third_party/ssba/Geometry/*.cpp')
- src += env.Glob('third_party/ssba/Math/*.cpp')
-
--incs = '. ../Eigen3'
-+incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-
-diff -Npur blender-2.62.orig/intern/itasc/CMakeLists.txt blender-2.62/intern/itasc/CMakeLists.txt
---- blender-2.62.orig/intern/itasc/CMakeLists.txt 2012-02-17 14:50:37.606393781 +0100
-+++ blender-2.62/intern/itasc/CMakeLists.txt 2012-02-17 14:51:01.457393369 +0100
-@@ -24,11 +24,11 @@
- # ***** END GPL LICENSE BLOCK *****
-
- set(INC
-- ../../extern/Eigen3
-+
- )
-
- set(INC_SYS
--
-+ /usr/include/eigen3
- )
-
- set(SRC
-@@ -121,201 +121,201 @@ set(SRC
- kdl/framevel.inl
-
- # until we have another user...
-- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h
-- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
-- ../../extern/Eigen3/Eigen/src/misc/Kernel.h
-- ../../extern/Eigen3/Eigen/src/misc/Image.h
-- ../../extern/Eigen3/Eigen/src/misc/Solve.h
-- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h
-- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
-- ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/details.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h
-- ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
-- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
-- ../../extern/Eigen3/Eigen/src/Householder/Householder.h
-- ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
-- ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
-- ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
-- ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
-- ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
-- ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
-- ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
-- ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Translation.h
-- ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Transform.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h
-- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h
-- ../../extern/Eigen3/Eigen/src/LU/Determinant.h
-- ../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
-- ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h
-- ../../extern/Eigen3/Eigen/src/LU/Inverse.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrixBase.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseVector.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/TriangularSolver.h
-- ../../extern/Eigen3/Eigen/src/Sparse/AmbiVector.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseDenseProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseBlock.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseTriangularView.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
-- ../../extern/Eigen3/Eigen/src/Sparse/CoreIterators.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrix.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseAssign.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseSparseProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseDot.h
-- ../../extern/Eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseRedux.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseFuzzy.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseView.h
-- ../../extern/Eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseUtil.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseTranspose.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/CompressedStorage.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
-- ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
-- ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h
-- ../../extern/Eigen3/Eigen/src/Core/Swap.h
-- ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
-- ../../extern/Eigen3/Eigen/src/Core/DenseBase.h
-- ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
-- ../../extern/Eigen3/Eigen/src/Core/ProductBase.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/Stride.h
-- ../../extern/Eigen3/Eigen/src/Core/Matrix.h
-- ../../extern/Eigen3/Eigen/src/Core/Visitor.h
-- ../../extern/Eigen3/Eigen/src/Core/Array.h
-- ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h
-- ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/EigenBase.h
-- ../../extern/Eigen3/Eigen/src/Core/Random.h
-- ../../extern/Eigen3/Eigen/src/Core/Redux.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/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/BooleanRedux.h
-- ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
-- ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Memory.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Meta.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Constants.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Macros.h
-- ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
-- ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
-- ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
-- ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h
-- ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h
-- ../../extern/Eigen3/Eigen/src/Core/Transpositions.h
-- ../../extern/Eigen3/Eigen/src/Core/Select.h
-- ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
-- ../../extern/Eigen3/Eigen/src/Core/Dot.h
-- ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
-- ../../extern/Eigen3/Eigen/src/Core/Product.h
-- ../../extern/Eigen3/Eigen/src/Core/Transpose.h
-- ../../extern/Eigen3/Eigen/src/Core/Block.h
-- ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
-- ../../extern/Eigen3/Eigen/src/Core/MapBase.h
-- ../../extern/Eigen3/Eigen/src/Core/NoAlias.h
-- ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
-- ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
-- ../../extern/Eigen3/Eigen/src/Core/IO.h
-- ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/Reverse.h
-- ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h
-- ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h
-- ../../extern/Eigen3/Eigen/src/Core/StableNorm.h
-- ../../extern/Eigen3/Eigen/src/Core/NumTraits.h
-- ../../extern/Eigen3/Eigen/src/Core/Map.h
-- ../../extern/Eigen3/Eigen/src/Core/Functors.h
-- ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h
-- ../../extern/Eigen3/Eigen/src/Core/NestByValue.h
-- ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
-- ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h
-- ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h
-- ../../extern/Eigen3/Eigen/src/Core/Diagonal.h
-- ../../extern/Eigen3/Eigen/src/Core/Replicate.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
-- ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
-- ../../extern/Eigen3/Eigen/src/Core/Assign.h
-- ../../extern/Eigen3/Eigen/src/Core/Flagged.h
-- ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h
-- ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
-+ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/BlockMethods.h
-+ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
-+ /usr/include/eigen3/Eigen/src/misc/Kernel.h
-+ /usr/include/eigen3/Eigen/src/misc/Image.h
-+ /usr/include/eigen3/Eigen/src/misc/Solve.h
-+ /usr/include/eigen3/Eigen/src/QR/HouseholderQR.h
-+ /usr/include/eigen3/Eigen/src/QR/ColPivHouseholderQR.h
-+ /usr/include/eigen3/Eigen/src/QR/FullPivHouseholderQR.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/details.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/StdList.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/StdDeque.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/StdVector.h
-+ /usr/include/eigen3/Eigen/src/SVD/UpperBidiagonalization.h
-+ /usr/include/eigen3/Eigen/src/SVD/JacobiSVD.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/RealSchur.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Jacobi/Jacobi.h
-+ /usr/include/eigen3/Eigen/src/Householder/Householder.h
-+ /usr/include/eigen3/Eigen/src/Householder/BlockHouseholder.h
-+ /usr/include/eigen3/Eigen/src/Householder/HouseholderSequence.h
-+ /usr/include/eigen3/Eigen/src/Geometry/RotationBase.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Rotation2D.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Homogeneous.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Hyperplane.h
-+ /usr/include/eigen3/Eigen/src/Geometry/EulerAngles.h
-+ /usr/include/eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
-+ /usr/include/eigen3/Eigen/src/Geometry/ParametrizedLine.h
-+ /usr/include/eigen3/Eigen/src/Geometry/OrthoMethods.h
-+ /usr/include/eigen3/Eigen/src/Geometry/AngleAxis.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Umeyama.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Scaling.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Translation.h
-+ /usr/include/eigen3/Eigen/src/Geometry/AlignedBox.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Transform.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Quaternion.h
-+ /usr/include/eigen3/Eigen/src/LU/PartialPivLU.h
-+ /usr/include/eigen3/Eigen/src/LU/Determinant.h
-+ /usr/include/eigen3/Eigen/src/LU/arch/Inverse_SSE.h
-+ /usr/include/eigen3/Eigen/src/LU/FullPivLU.h
-+ /usr/include/eigen3/Eigen/src/LU/Inverse.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrixBase.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseVector.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/TriangularSolver.h
-+ /usr/include/eigen3/Eigen/src/Sparse/AmbiVector.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseDenseProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseBlock.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseTriangularView.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
-+ /usr/include/eigen3/Eigen/src/Sparse/CoreIterators.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrix.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseAssign.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseSparseProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseDot.h
-+ /usr/include/eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseRedux.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseFuzzy.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseView.h
-+ /usr/include/eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseUtil.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseTranspose.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/CompressedStorage.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Cwise.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/QR.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Lazy.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Memory.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/SVD.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/VectorBlock.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Meta.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Macros.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/LeastSquares.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/LU.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Block.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/All.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Minor.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/MathFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/SelfAdjointView.h
-+ /usr/include/eigen3/Eigen/src/Core/MatrixBase.h
-+ /usr/include/eigen3/Eigen/src/Core/Swap.h
-+ /usr/include/eigen3/Eigen/src/Core/DenseCoeffsBase.h
-+ /usr/include/eigen3/Eigen/src/Core/DenseBase.h
-+ /usr/include/eigen3/Eigen/src/Core/GlobalFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/ProductBase.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseBinaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/Stride.h
-+ /usr/include/eigen3/Eigen/src/Core/Matrix.h
-+ /usr/include/eigen3/Eigen/src/Core/Visitor.h
-+ /usr/include/eigen3/Eigen/src/Core/Array.h
-+ /usr/include/eigen3/Eigen/src/Core/ReturnByValue.h
-+ /usr/include/eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/EigenBase.h
-+ /usr/include/eigen3/Eigen/src/Core/Random.h
-+ /usr/include/eigen3/Eigen/src/Core/Redux.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/Default/Settings.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/NEON/Complex.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/Complex.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/BooleanRedux.h
-+ /usr/include/eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
-+ /usr/include/eigen3/Eigen/src/Core/util/BlasUtil.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Memory.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Meta.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Constants.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Macros.h
-+ /usr/include/eigen3/Eigen/src/Core/util/ForwardDeclarations.h
-+ /usr/include/eigen3/Eigen/src/Core/util/StaticAssert.h
-+ /usr/include/eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
-+ /usr/include/eigen3/Eigen/src/Core/util/XprHelper.h
-+ /usr/include/eigen3/Eigen/src/Core/VectorBlock.h
-+ /usr/include/eigen3/Eigen/src/Core/Transpositions.h
-+ /usr/include/eigen3/Eigen/src/Core/Select.h
-+ /usr/include/eigen3/Eigen/src/Core/BandMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryView.h
-+ /usr/include/eigen3/Eigen/src/Core/Dot.h
-+ /usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/Product.h
-+ /usr/include/eigen3/Eigen/src/Core/Transpose.h
-+ /usr/include/eigen3/Eigen/src/Core/Block.h
-+ /usr/include/eigen3/Eigen/src/Core/ArrayWrapper.h
-+ /usr/include/eigen3/Eigen/src/Core/MapBase.h
-+ /usr/include/eigen3/Eigen/src/Core/NoAlias.h
-+ /usr/include/eigen3/Eigen/src/Core/ForceAlignedAccess.h
-+ /usr/include/eigen3/Eigen/src/Core/PlainObjectBase.h
-+ /usr/include/eigen3/Eigen/src/Core/IO.h
-+ /usr/include/eigen3/Eigen/src/Core/DiagonalMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/Reverse.h
-+ /usr/include/eigen3/Eigen/src/Core/Fuzzy.h
-+ /usr/include/eigen3/Eigen/src/Core/DenseStorage.h
-+ /usr/include/eigen3/Eigen/src/Core/StableNorm.h
-+ /usr/include/eigen3/Eigen/src/Core/NumTraits.h
-+ /usr/include/eigen3/Eigen/src/Core/Map.h
-+ /usr/include/eigen3/Eigen/src/Core/Functors.h
-+ /usr/include/eigen3/Eigen/src/Core/PermutationMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/ArrayBase.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseNullaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/SolveTriangular.h
-+ /usr/include/eigen3/Eigen/src/Core/NestByValue.h
-+ /usr/include/eigen3/Eigen/src/Core/DiagonalProduct.h
-+ /usr/include/eigen3/Eigen/src/Core/CommaInitializer.h
-+ /usr/include/eigen3/Eigen/src/Core/MathFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/Diagonal.h
-+ /usr/include/eigen3/Eigen/src/Core/Replicate.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointProduct.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/Parallelizer.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
-+ /usr/include/eigen3/Eigen/src/Core/TriangularMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/VectorwiseOp.h
-+ /usr/include/eigen3/Eigen/src/Core/Assign.h
-+ /usr/include/eigen3/Eigen/src/Core/Flagged.h
-+ /usr/include/eigen3/Eigen/src/Cholesky/LDLT.h
-+ /usr/include/eigen3/Eigen/src/Cholesky/LLT.h
- )
-
- if(WIN32)
-diff -Npur blender-2.62.orig/intern/itasc/SConscript blender-2.62/intern/itasc/SConscript
---- blender-2.62.orig/intern/itasc/SConscript 2012-02-17 14:50:37.606393781 +0100
-+++ blender-2.62/intern/itasc/SConscript 2012-02-17 14:51:01.457393369 +0100
-@@ -5,7 +5,7 @@ sources = env.Glob('*.cpp')
- sources += env.Glob('kdl/*.cpp')
- sources += env.Glob('kdl/utilities/*.cpp')
-
--incs = '. ../../extern/Eigen3'
-+incs = '. /usr/include/eigen3'
-
- defs = []
-
-diff -Npur blender-2.62.orig/source/blender/ikplugin/CMakeLists.txt blender-2.62/source/blender/ikplugin/CMakeLists.txt
---- blender-2.62.orig/source/blender/ikplugin/CMakeLists.txt 2012-02-17 14:50:37.438393787 +0100
-+++ blender-2.62/source/blender/ikplugin/CMakeLists.txt 2012-02-17 14:51:01.457393369 +0100
-@@ -49,9 +49,11 @@ set(SRC
- if(WITH_IK_ITASC)
- add_definitions(-DWITH_IK_ITASC)
- list(APPEND INC
-- ../../../extern/Eigen3
- ../../../intern/itasc
- )
-+ list(APPEND INC_SYS
-+ /usr/include/eigen3
-+ )
- list(APPEND SRC
- intern/itasc_plugin.cpp
- )
-diff -Npur blender-2.62.orig/source/blender/ikplugin/SConscript blender-2.62/source/blender/ikplugin/SConscript
---- blender-2.62.orig/source/blender/ikplugin/SConscript 2012-02-17 14:50:37.438393787 +0100
-+++ blender-2.62/source/blender/ikplugin/SConscript 2012-02-17 14:51:01.457393369 +0100
-@@ -4,7 +4,7 @@ defs = []
- sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
-
- incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
--incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3'
-+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen3'
-
- defs.append('WITH_IK_ITASC')
-
-diff -Npur blender-2.62.orig/source/gameengine/Converter/CMakeLists.txt blender-2.62/source/gameengine/Converter/CMakeLists.txt
---- blender-2.62.orig/source/gameengine/Converter/CMakeLists.txt 2012-02-17 14:50:37.290393789 +0100
-+++ blender-2.62/source/gameengine/Converter/CMakeLists.txt 2012-02-17 14:51:01.457393369 +0100
-@@ -50,7 +50,6 @@ set(INC
- ../../blender/makesrna
- ../../blender/windowmanager
- ../../../extern/bullet2/src
-- ../../../extern/Eigen3
- ../../../intern/container
- ../../../intern/guardedalloc
- ../../../intern/moto/include
-@@ -59,7 +58,7 @@ set(INC
- )
-
- set(INC_SYS
--
-+ /usr/include/eigen3
- )
-
- set(SRC
-diff -Npur blender-2.62.orig/source/gameengine/Converter/SConscript blender-2.62/source/gameengine/Converter/SConscript
---- blender-2.62.orig/source/gameengine/Converter/SConscript 2012-02-17 14:50:37.290393789 +0100
-+++ blender-2.62/source/gameengine/Converter/SConscript 2012-02-17 14:51:01.458393365 +0100
-@@ -21,7 +21,7 @@ incs += ' #source/blender/windowmanager'
- incs += ' #source/blender/makesrna'
- incs += ' #source/blender/ikplugin'
- incs += ' #extern/recastnavigation/Detour/Include'
--incs += ' #extern/Eigen3'
-+incs += ' /usr/include/eigen3'
-
- incs += ' ' + env['BF_BULLET_INC']
-
-diff -Npur blender-2.62.orig/intern/dualcon/SConscript blender-2.62/intern/dualcon/SConscript
---- blender-2.62.orig/intern/dualcon/SConscript 2012-02-20 13:49:32.295876267 +0100
-+++ blender-2.62/intern/dualcon/SConscript 2012-02-20 13:50:09.289875616 +0100
-@@ -3,7 +3,7 @@ Import ('env')
-
- sources = env.Glob('intern/*.cpp')
-
--incs = '. ../../extern/Eigen3'
-+incs = '. /usr/include/eigen3'
- defs = ''
-
- env.BlenderLib ('bf_intern_dualcon', sources, Split(incs), Split(defs), libtype=['intern'], priority=[100] )
diff --git a/media-gfx/blender/files/blender-2.62-enable_site_module.patch b/media-gfx/blender/files/blender-2.62-enable_site_module.patch
deleted file mode 100644
index d0ec7a9..0000000
--- a/media-gfx/blender/files/blender-2.62-enable_site_module.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Npur blender-2.62.orig/source/blender/python/intern/bpy_interface.c blender-2.62/source/blender/python/intern/bpy_interface.c
---- blender-2.62.orig/source/blender/python/intern/bpy_interface.c 2012-02-17 15:20:49.387361754 +0100
-+++ blender-2.62/source/blender/python/intern/bpy_interface.c 2012-02-17 15:21:57.686360545 +0100
-@@ -226,11 +226,6 @@ void BPY_python_start(int argc, const ch
- * blender is utf-8 too - campbell */
- BLI_setenv("PYTHONIOENCODING", "utf-8:surrogateescape");
-
-- /* Python 3.2 now looks for '2.xx/python/include/python3.2d/pyconfig.h' to
-- * parse from the 'sysconfig' module which is used by 'site',
-- * so for now disable site. alternatively we could copy the file. */
-- Py_NoSiteFlag = 1;
--
- Py_Initialize();
-
- // PySys_SetArgv(argc, argv); // broken in py3, not a huge deal
-diff -Npur blender-2.62.orig/source/gameengine/Ketsji/KX_PythonInit.cpp blender-2.62/source/gameengine/Ketsji/KX_PythonInit.cpp
---- blender-2.62.orig/source/gameengine/Ketsji/KX_PythonInit.cpp 2012-02-17 15:20:49.364361754 +0100
-+++ blender-2.62/source/gameengine/Ketsji/KX_PythonInit.cpp 2012-02-17 15:22:51.659359564 +0100
-@@ -1848,7 +1848,6 @@ PyObject* initGamePlayerPythonScripting(
- STR_String pname = progname;
- Py_SetProgramName(pname.Ptr());
- #endif
-- Py_NoSiteFlag=1;
- Py_FrozenFlag=1;
-
- /* must run before python initializes */
-@@ -1929,7 +1928,6 @@ PyObject* initGamePythonScripting(const
- STR_String pname = progname;
- Py_SetProgramName(pname.Ptr());
- #endif
-- Py_NoSiteFlag=1;
- Py_FrozenFlag=1;
-
- #ifdef WITH_AUDASPACE
diff --git a/media-gfx/blender/files/blender-2.62-glew.patch b/media-gfx/blender/files/blender-2.62-glew.patch
deleted file mode 100644
index 757f781..0000000
--- a/media-gfx/blender/files/blender-2.62-glew.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Npur blender-2.62.orig/CMakeLists.txt blender-2.62/CMakeLists.txt
---- blender-2.62.orig/CMakeLists.txt 2012-02-17 14:46:00.705398679 +0100
-+++ blender-2.62/CMakeLists.txt 2012-02-17 14:49:05.631395413 +0100
-@@ -157,7 +157,7 @@ endif()
- if(UNIX AND NOT APPLE)
- option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
- option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON)
-- option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
-+ option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" OFF)
- option(WITH_XDG_USER_DIRS "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
- mark_as_advanced(WITH_XDG_USER_DIRS)
- else()
-diff -Npur blender-2.62.orig/extern/CMakeLists.txt blender-2.62/extern/CMakeLists.txt
---- blender-2.62.orig/extern/CMakeLists.txt 2012-02-17 14:46:00.617398680 +0100
-+++ blender-2.62/extern/CMakeLists.txt 2012-02-17 14:48:31.043396011 +0100
-@@ -40,10 +40,6 @@ if(WITH_BINRELOC)
- add_subdirectory(binreloc)
- endif()
-
--if(WITH_BUILTIN_GLEW)
-- add_subdirectory(glew)
--endif()
--
- if(WITH_GAMEENGINE)
- add_subdirectory(recastnavigation)
- endif()
-diff -Npur blender-2.62.orig/extern/SConscript blender-2.62/extern/SConscript
---- blender-2.62.orig/extern/SConscript 2012-02-17 14:46:00.612398681 +0100
-+++ blender-2.62/extern/SConscript 2012-02-17 14:47:40.178396919 +0100
-@@ -2,7 +2,6 @@
-
- Import('env')
-
--SConscript(['glew/SConscript'])
- SConscript(['colamd/SConscript'])
-
- if env['WITH_BF_GAMEENGINE']:
-diff -Npur blender-2.62.orig/source/blender/editors/include/BIF_gl.h blender-2.62/source/blender/editors/include/BIF_gl.h
---- blender-2.62.orig/source/blender/editors/include/BIF_gl.h 2012-02-17 14:46:00.843398676 +0100
-+++ blender-2.62/source/blender/editors/include/BIF_gl.h 2012-02-17 14:48:07.365396454 +0100
-@@ -33,7 +33,7 @@
- #ifndef BIF_GL_H
- #define BIF_GL_H
-
--#include "GL/glew.h"
-+#include <GL/glew.h>
-
- /*
- * these should be phased out. cpack should be replaced in
diff --git a/media-gfx/blender/files/blender-2.62-insecure.desktop b/media-gfx/blender/files/blender-2.62-insecure.desktop
deleted file mode 100644
index 4c0ed05..0000000
--- a/media-gfx/blender/files/blender-2.62-insecure.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Blender-2.62 (reduced security)
-GenericName=3D modeller (reduced security)
-GenericName[es]=modelador 3D (reduced security)
-GenericName[de]=3D Modellierer (weniger Sicherheit)
-GenericName[fr]=modeleur 3D (reduced security)
-GenericName[ru]=Редактор 3D-моделей (reduced security)
-Comment=3D modeling, animation, rendering and post-production
-Comment[es]=modelado 3D, animación, renderizado y post-producción
-Exec=blender-2.62 --enable-autoexec %f
-Icon=blender-2.62
-Terminal=false
-Type=Application
-Categories=Graphics;3DGraphics;
-MimeType=application/x-blender;
diff --git a/media-gfx/blender/files/blender-2.62-jp2.patch b/media-gfx/blender/files/blender-2.62-jp2.patch
deleted file mode 100644
index bc4e04f..0000000
--- a/media-gfx/blender/files/blender-2.62-jp2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'source/blender/imbuf/intern/jp2.c'
---- source/blender/imbuf/intern/jp2.c 2012-03-31 13:59:45 +0000
-+++ source/blender/imbuf/intern/jp2.c 2012-03-31 13:59:55 +0000
-@@ -329,7 +329,7 @@
-
- static void cinema_parameters(opj_cparameters_t *parameters)
- {
-- parameters->tile_size_on = false;
-+ parameters->tile_size_on = FALSE;
- parameters->cp_tdx=1;
- parameters->cp_tdy=1;
-
-
diff --git a/media-gfx/blender/files/blender-2.62-opencollada-debug.patch b/media-gfx/blender/files/blender-2.62-opencollada-debug.patch
deleted file mode 100644
index 54223a3..0000000
--- a/media-gfx/blender/files/blender-2.62-opencollada-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Npur blender-2.62.orig/build_files/scons/tools/Blender.py blender-2.62/build_files/scons/tools/Blender.py
---- blender-2.62.orig/build_files/scons/tools/Blender.py 2012-02-17 15:24:18.428358058 +0100
-+++ blender-2.62/build_files/scons/tools/Blender.py 2012-02-17 15:26:23.280355822 +0100
-@@ -276,10 +276,7 @@ def setup_syslibs(lenv):
- syslibs += Split(lenv['BF_PTHREADS_LIB'])
- if lenv['WITH_BF_COLLADA']:
- syslibs.append(lenv['BF_PCRE_LIB'])
-- if lenv['BF_DEBUG'] and (lenv['OURPLATFORM'] != 'linux'):
-- syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])]
-- else:
-- syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
-+ syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
- syslibs.append(lenv['BF_EXPAT_LIB'])
- if lenv['WITH_BF_COLAMD']:
- syslibs += Split(lenv['BF_COLAMD_LIB'])
diff --git a/media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch b/media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch
deleted file mode 100644
index 671e037..0000000
--- a/media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-diff -Npur blender-2.63.orig/build_files/scons/tools/btools.py blender-2.63/build_files/scons/tools/btools.py
---- blender-2.63.orig/build_files/scons/tools/btools.py 2012-05-08 00:05:06.963498491 +0200
-+++ blender-2.63/build_files/scons/tools/btools.py 2012-05-08 00:06:42.238496807 +0200
-@@ -96,7 +96,7 @@ def print_arguments(args, bc):
-
- def validate_arguments(args, bc):
- opts_list = [
-- 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS',
-+ 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', 'WITH_PYTHON_SECURITY',
- 'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC',
- 'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH',
- 'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH',
-@@ -261,6 +261,7 @@ def read_opts(env, cfg, args):
- (BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)),
- (BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)),
- ('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''),
-+ (BoolVariable('WITH_PYTHON_SECURITY', 'Disables execution of scripts within blend files by default (recommend to leave off)', False)),
-
- (BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)),
- (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)),
-diff -Npur blender-2.63.orig/SConstruct blender-2.63/SConstruct
---- blender-2.63.orig/SConstruct 2012-05-08 00:05:06.933498492 +0200
-+++ blender-2.63/SConstruct 2012-05-08 00:05:45.665497801 +0200
-@@ -349,6 +349,10 @@ if 'blenderplayer' in B.targets:
- if 'blendernogame' in B.targets:
- env['WITH_BF_GAMEENGINE'] = False
-
-+# build without python autoexec security?
-+if env['WITH_PYTHON_SECURITY'] == True:
-+ env.Append(CPPFLAGS=['-DWITH_PYTHON_SECURITY'])
-+
- # build without elbeem (fluidsim)?
- if env['WITH_BF_FLUID'] == 1:
- env['CPPFLAGS'].append('-DWITH_MOD_FLUID')
-diff -Npur blender-2.63.orig/source/blender/blenkernel/intern/blender.c blender-2.63/source/blender/blenkernel/intern/blender.c
---- blender-2.63.orig/source/blender/blenkernel/intern/blender.c 2012-05-08 00:05:06.994498491 +0200
-+++ blender-2.63/source/blender/blenkernel/intern/blender.c 2012-05-08 00:07:04.274496414 +0200
-@@ -145,6 +145,7 @@ void initglobals(void)
- G.f |= G_SCRIPT_AUTOEXEC;
- #else
- G.f &= ~G_SCRIPT_AUTOEXEC;
-+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- #endif
- }
-
-diff -Npur blender-2.63.orig/source/blender/makesrna/intern/rna_userdef.c blender-2.63/source/blender/makesrna/intern/rna_userdef.c
---- blender-2.63.orig/source/blender/makesrna/intern/rna_userdef.c 2012-05-08 00:05:07.002498491 +0200
-+++ blender-2.63/source/blender/makesrna/intern/rna_userdef.c 2012-05-08 00:08:04.547495355 +0200
-@@ -126,9 +126,17 @@ static void rna_userdef_show_manipulator
-
- static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
- {
-- UserDef *userdef = (UserDef*)ptr->data;
-- if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC;
-- else G.f |= G_SCRIPT_AUTOEXEC;
-+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+ /* Blender run with --enable-autoexec */
-+ UserDef *userdef = (UserDef*)ptr->data;
-+ if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC;
-+ else G.f |= G_SCRIPT_AUTOEXEC;
-+ }
-+}
-+
-+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) {
-+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+ return !(G.f & G_SCRIPT_OVERRIDE_PREF);
- }
-
- static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr)
-@@ -2994,6 +3002,8 @@ static void rna_def_userdef_system(Blend
- "Allow any .blend file to run scripts automatically "
- "(unsafe with blend files from an untrusted source)");
- RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update");
-+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */
-+ RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable");
-
- prop = RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE);
-diff -Npur blender-2.63.orig/source/blender/windowmanager/intern/wm_files.c blender-2.63/source/blender/windowmanager/intern/wm_files.c
---- blender-2.63.orig/source/blender/windowmanager/intern/wm_files.c 2012-05-08 00:05:07.094498489 +0200
-+++ blender-2.63/source/blender/windowmanager/intern/wm_files.c 2012-05-08 00:09:20.964493999 +0200
-@@ -288,13 +288,18 @@ static void wm_init_userdef(bContext *C)
-
- /* set the python auto-execute setting from user prefs */
- /* enabled by default, unless explicitly enabled in the command line which overrides */
-- if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) {
-+ if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) {
-+ /* Blender run with --enable-autoexec */
- if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |= G_SCRIPT_AUTOEXEC;
- else G.f &= ~G_SCRIPT_AUTOEXEC;
- }
-
- /* update tempdir from user preferences */
- BLI_init_temporary_dir(U.tempdir);
-+
-+ /* Workaround to fix default of "Auto Run Python Scripts" checkbox */
-+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC))
-+ U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE;
- }
-
-
-diff -Npur blender-2.63.orig/source/blender/windowmanager/intern/wm_operators.c blender-2.63/source/blender/windowmanager/intern/wm_operators.c
---- blender-2.63.orig/source/blender/windowmanager/intern/wm_operators.c 2012-05-08 00:05:07.093498489 +0200
-+++ blender-2.63/source/blender/windowmanager/intern/wm_operators.c 2012-05-08 00:10:59.325492259 +0200
-@@ -1627,12 +1627,13 @@ static int wm_open_mainfile_exec(bContex
- G.fileflags &= ~G_FILE_NO_UI;
- else
- G.fileflags |= G_FILE_NO_UI;
--
-- if (RNA_boolean_get(op->ptr, "use_scripts"))
-+
-+ /* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */
-+ if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF)))
- G.f |= G_SCRIPT_AUTOEXEC;
- else
- G.f &= ~G_SCRIPT_AUTOEXEC;
--
-+
- // XXX wm in context is not set correctly after WM_read_file -> crash
- // do it before for now, but is this correct with multiple windows?
- WM_event_add_notifier(C, NC_WINDOW, NULL);
-@@ -1644,6 +1645,8 @@ static int wm_open_mainfile_exec(bContex
-
- static void WM_OT_open_mainfile(wmOperatorType *ot)
- {
-+ PropertyRNA * use_scripts_checkbox = NULL;
-+
- ot->name = "Open Blender File";
- ot->idname = "WM_OT_open_mainfile";
- ot->description = "Open a Blender file";
-@@ -1656,8 +1659,12 @@ static void WM_OT_open_mainfile(wmOperat
- WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY);
-
- RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file");
-- RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source",
-+ use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts",
-+ !!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source",
- "Allow .blend file to execute scripts automatically, default available from system preferences");
-+ /* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */
-+ if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF))
-+ RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE);
- }
-
- /* **************** link/append *************** */
-diff -Npur blender-2.63.orig/source/creator/creator.c blender-2.63/source/creator/creator.c
---- blender-2.63.orig/source/creator/creator.c 2012-05-08 00:05:06.987498491 +0200
-+++ blender-2.63/source/creator/creator.c 2012-05-08 00:11:37.213491621 +0200
-@@ -342,14 +342,14 @@ static int end_arguments(int UNUSED(argc
- static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- G.f |= G_SCRIPT_AUTOEXEC;
-- G.f |= G_SCRIPT_OVERRIDE_PREF;
-+ G.f &= ~G_SCRIPT_OVERRIDE_PREF; /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */
- return 0;
- }
-
- static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
- {
- G.f &= ~G_SCRIPT_AUTOEXEC;
-- G.f |= G_SCRIPT_OVERRIDE_PREF;
-+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */
- return 0;
- }
-
diff --git a/media-gfx/blender/files/blender-2.63-bullet.patch b/media-gfx/blender/files/blender-2.63-bullet.patch
deleted file mode 100644
index 6798fda..0000000
--- a/media-gfx/blender/files/blender-2.63-bullet.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-diff -Npur blender-2.63.orig/build_files/scons/tools/Blender.py blender-2.63/build_files/scons/tools/Blender.py
---- blender-2.63.orig/build_files/scons/tools/Blender.py 2012-05-07 23:11:26.396555426 +0200
-+++ blender-2.63/build_files/scons/tools/Blender.py 2012-05-07 23:12:34.965554211 +0200
-@@ -270,6 +270,8 @@ def setup_syslibs(lenv):
- syslibs += Split(lenv['BF_SDL_LIB'])
- if not lenv['WITH_BF_STATICOPENGL']:
- syslibs += Split(lenv['BF_OPENGL_LIB'])
-+ if lenv['WITH_BF_BULLET']:
-+ syslibs += Split(lenv['BF_BULLET_LIB'])
- if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross', 'win64-vc', 'win64-mingw'):
- syslibs += Split(lenv['BF_PTHREADS_LIB'])
- if lenv['WITH_BF_COLLADA']:
-Les fichiers binaires blender-2.63.orig/build_files/scons/tools/.Blender.py.swp et blender-2.63/build_files/scons/tools/.Blender.py.swp sont différents.
-diff -Npur blender-2.63.orig/doc/doxygen/Doxyfile blender-2.63/doc/doxygen/Doxyfile
---- blender-2.63.orig/doc/doxygen/Doxyfile 2012-05-07 23:11:26.375555426 +0200
-+++ blender-2.63/doc/doxygen/Doxyfile 2012-05-07 23:13:03.593553708 +0200
-@@ -617,8 +617,7 @@ INPUT = doxygen.main \
- doxygen.intern \
- doxygen.extern \
- ../../source \
-- ../../intern \
-- ../../extern/bullet2
-+ ../../intern
-
- # This tag can be used to specify the character encoding of the source files
- # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-diff -Npur blender-2.63.orig/extern/CMakeLists.txt blender-2.63/extern/CMakeLists.txt
---- blender-2.63.orig/extern/CMakeLists.txt 2012-05-07 23:11:26.393555426 +0200
-+++ blender-2.63/extern/CMakeLists.txt 2012-05-07 23:13:17.988553449 +0200
-@@ -28,10 +28,6 @@ remove_strict_flags()
-
- add_subdirectory(colamd)
-
--if(WITH_BULLET)
-- add_subdirectory(bullet2)
--endif()
--
- if(WITH_MOD_CLOTH_ELTOPO)
- add_subdirectory(eltopo)
- endif()
-diff -Npur blender-2.63.orig/extern/SConscript blender-2.63/extern/SConscript
---- blender-2.63.orig/extern/SConscript 2012-05-07 23:11:26.392555426 +0200
-+++ blender-2.63/extern/SConscript 2012-05-07 23:14:02.743552661 +0200
-@@ -10,9 +10,6 @@ if env['WITH_BF_GAMEENGINE']:
- if env['WITH_BF_ELTOPO']:
- SConscript(['eltopo/SConscript'])
-
--if env['WITH_BF_BULLET']:
-- SConscript(['bullet2/src/SConscript'])
--
- if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '':
- SConscript(['libredcode/SConscript'])
-
-diff -Npur blender-2.63.orig/intern/smoke/CMakeLists.txt blender-2.63/intern/smoke/CMakeLists.txt
---- blender-2.63.orig/intern/smoke/CMakeLists.txt 2012-05-07 23:11:26.588555423 +0200
-+++ blender-2.63/intern/smoke/CMakeLists.txt 2012-05-07 23:14:28.696552195 +0200
-@@ -26,10 +26,10 @@
- set(INC
- intern
- ../memutil
-- ../../extern/bullet2/src
- )
-
- set(INC_SYS
-+ /usr/include/bullet
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
- )
-diff -Npur blender-2.63.orig/intern/smoke/SConscript blender-2.63/intern/smoke/SConscript
---- blender-2.63.orig/intern/smoke/SConscript 2012-05-07 23:11:26.588555423 +0200
-+++ blender-2.63/intern/smoke/SConscript 2012-05-07 23:14:54.374551750 +0200
-@@ -13,7 +13,7 @@ if env['WITH_BF_OPENMP']:
- defs += ' PARALLEL=1'
-
- incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC']
--incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc '
-+incs += ' intern /usr/include/bullet ../memutil ../guardealloc '
-
- if env['WITH_BF_FFTW3']:
- defs += ' WITH_FFTW3'
-diff -Npur blender-2.63.orig/source/blender/blenkernel/CMakeLists.txt blender-2.63/source/blender/blenkernel/CMakeLists.txt
---- blender-2.63.orig/source/blender/blenkernel/CMakeLists.txt 2012-05-07 23:11:26.424555425 +0200
-+++ blender-2.63/source/blender/blenkernel/CMakeLists.txt 2012-05-07 23:15:38.670550966 +0200
-@@ -241,8 +241,8 @@ if(WITH_AUDASPACE)
- endif()
-
- if(WITH_BULLET)
-- list(APPEND INC
-- ../../../extern/bullet2/src
-+ list(APPEND INC_SYS
-+ /usr/include/bullet
- )
- add_definitions(-DUSE_BULLET)
- endif()
-diff -Npur blender-2.63.orig/source/blender/blenkernel/SConscript blender-2.63/source/blender/blenkernel/SConscript
---- blender-2.63.orig/source/blender/blenkernel/SConscript 2012-05-07 23:11:26.424555425 +0200
-+++ blender-2.63/source/blender/blenkernel/SConscript 2012-05-07 23:15:57.449550634 +0200
-@@ -9,7 +9,7 @@ incs += ' ../blenlib ../blenfont ../make
- incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna'
- incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers'
- incs += ' #/intern/iksolver/extern ../blenloader'
--incs += ' #/extern/bullet2/src'
-+incs += ' /usr/include/bullet'
- incs += ' #/intern/opennl/extern #/intern/bsp/extern'
- incs += ' ../gpu #/extern/glew/include'
- incs += ' ../bmesh'
-diff -Npur blender-2.63.orig/source/gameengine/BlenderRoutines/CMakeLists.txt blender-2.63/source/gameengine/BlenderRoutines/CMakeLists.txt
---- blender-2.63.orig/source/gameengine/BlenderRoutines/CMakeLists.txt 2012-05-07 23:11:26.402555426 +0200
-+++ blender-2.63/source/gameengine/BlenderRoutines/CMakeLists.txt 2012-05-07 23:16:28.027550096 +0200
-@@ -23,7 +23,6 @@ set(INC
- ../../blender/makesdna
- ../../blender/makesrna
- ../../blender/windowmanager
-- ../../../extern/bullet2/src
- ../../../intern/container
- ../../../intern/guardedalloc
- ../../../intern/moto/include
-@@ -32,7 +31,7 @@ set(INC
- )
-
- set(INC_SYS
--
-+ /usr/include/bullet
- )
-
- set(SRC
-diff -Npur blender-2.63.orig/source/gameengine/Converter/CMakeLists.txt blender-2.63/source/gameengine/Converter/CMakeLists.txt
---- blender-2.63.orig/source/gameengine/Converter/CMakeLists.txt 2012-05-07 23:11:26.407555426 +0200
-+++ blender-2.63/source/gameengine/Converter/CMakeLists.txt 2012-05-07 23:17:17.198549223 +0200
-@@ -49,7 +49,6 @@ set(INC
- ../../blender/makesdna
- ../../blender/makesrna
- ../../blender/windowmanager
-- ../../../extern/bullet2/src
- ../../../intern/container
- ../../../intern/guardedalloc
- ../../../intern/moto/include
-@@ -59,6 +58,7 @@ set(INC
-
- set(INC_SYS
- /usr/include/eigen3
-+ /usr/include/bullet
- )
-
- set(SRC
-diff -Npur blender-2.63.orig/source/gameengine/Ketsji/CMakeLists.txt blender-2.63/source/gameengine/Ketsji/CMakeLists.txt
---- blender-2.63.orig/source/gameengine/Ketsji/CMakeLists.txt 2012-05-07 23:11:26.414555426 +0200
-+++ blender-2.63/source/gameengine/Ketsji/CMakeLists.txt 2012-05-07 23:18:53.098547529 +0200
-@@ -241,9 +241,11 @@ endif()
-
- if(WITH_BULLET)
- list(APPEND INC
-- ../../../extern/bullet2/src
- ../Physics/Bullet
- )
-+ list(APPEND INC_SYS
-+ /usr/include/bullet
-+ )
- add_definitions(-DUSE_BULLET)
- endif()
-
-diff -Npur blender-2.63.orig/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp blender-2.63/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
---- blender-2.63.orig/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2012-05-07 23:11:26.402555426 +0200
-+++ blender-2.63/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2012-05-07 23:19:45.545546606 +0200
-@@ -2804,7 +2804,8 @@ float CcdPhysicsEnvironment::getApplied
-
- void CcdPhysicsEnvironment::exportFile(const char* filename)
- {
-- btDefaultSerializer* serializer = new btDefaultSerializer();
-+ // Workaround bullet-2.77 api change.
-+ btDefaultSerializer* serializer = new btDefaultSerializer(0);
-
-
- for (int i=0;i<m_dynamicsWorld->getNumCollisionObjects();i++)
-diff -Npur blender-2.63.orig/source/gameengine/Physics/Bullet/CMakeLists.txt blender-2.63/source/gameengine/Physics/Bullet/CMakeLists.txt
---- blender-2.63.orig/source/gameengine/Physics/Bullet/CMakeLists.txt 2012-05-07 23:11:26.402555426 +0200
-+++ blender-2.63/source/gameengine/Physics/Bullet/CMakeLists.txt 2012-05-07 23:20:13.314546112 +0200
-@@ -37,7 +37,6 @@ set(INC
- ../../../blender/blenkernel
- ../../../blender/blenlib
- ../../../blender/makesdna
-- ../../../../extern/bullet2/src
- ../../../../intern/container
- ../../../../intern/guardedalloc
- ../../../../intern/moto/include
-@@ -45,6 +44,7 @@ set(INC
- )
-
- set(INC_SYS
-+ /usr/include/bullet
- ${GLEW_INCLUDE_PATH}
- ${PYTHON_INCLUDE_DIRS}
- )
diff --git a/media-gfx/blender/files/blender-2.63-colamd.patch b/media-gfx/blender/files/blender-2.63-colamd.patch
deleted file mode 100644
index 1053e7c..0000000
--- a/media-gfx/blender/files/blender-2.63-colamd.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -Npur blender-2.63.orig/build_files/scons/config/linux-config.py blender-2.63/build_files/scons/config/linux-config.py
---- blender-2.63.orig/build_files/scons/config/linux-config.py 2012-05-07 23:21:26.969544809 +0200
-+++ blender-2.63/build_files/scons/config/linux-config.py 2012-05-07 23:22:07.191544094 +0200
-@@ -192,6 +192,11 @@ BF_EXPAT = '/usr'
- BF_EXPAT_LIB = 'expat'
- BF_EXPAT_LIBPATH = '/usr/lib'
-
-+WITH_BF_COLAMD = True
-+BF_COLAMD = '#extern/colamd'
-+BF_COLAMD_INC = '${BF_COLAMD}/include'
-+BF_COLAMD_LIB = 'extern_colamd'
-+
- WITH_BF_JEMALLOC = False
- WITH_BF_STATICJEMALLOC = False
- BF_JEMALLOC = '/usr'
-Les fichiers binaires blender-2.63.orig/build_files/scons/config/.linux-config.py.swp et blender-2.63/build_files/scons/config/.linux-config.py.swp sont différents.
-diff -Npur blender-2.63.orig/build_files/scons/tools/Blender.py blender-2.63/build_files/scons/tools/Blender.py
---- blender-2.63.orig/build_files/scons/tools/Blender.py 2012-05-07 23:21:26.969544809 +0200
-+++ blender-2.63/build_files/scons/tools/Blender.py 2012-05-07 23:22:38.453543549 +0200
-@@ -281,6 +281,8 @@ def setup_syslibs(lenv):
- else:
- syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
- syslibs.append(lenv['BF_EXPAT_LIB'])
-+ if lenv['WITH_BF_COLAMD']:
-+ syslibs += Split(lenv['BF_COLAMD_LIB'])
-
- if lenv['WITH_BF_JEMALLOC']:
- if not lenv['WITH_BF_STATICJEMALLOC']:
-diff -Npur blender-2.63.orig/build_files/scons/tools/btools.py blender-2.63/build_files/scons/tools/btools.py
---- blender-2.63.orig/build_files/scons/tools/btools.py 2012-05-07 23:21:26.969544809 +0200
-+++ blender-2.63/build_files/scons/tools/btools.py 2012-05-07 23:23:38.652542481 +0200
-@@ -126,6 +126,7 @@ def validate_arguments(args, bc):
- 'WITH_BF_FFTW3', 'BF_FFTW3', 'BF_FFTW3_INC', 'BF_FFTW3_LIB', 'BF_FFTW3_LIBPATH', 'WITH_BF_STATICFFTW3', 'BF_FFTW3_LIB_STATIC',
- 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC',
- 'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_INC', 'BF_OPENCOLLADA_LIB', 'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH', 'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH',
-+ 'WITH_BF_COLAMD', 'BF_COLAMD', 'BF_COLAMD_INC', 'BF_COLAMD_LIB',
- 'WITH_BF_PLAYER',
- 'WITH_BF_NOBLENDER',
- 'WITH_BF_BINRELOC',
-@@ -455,6 +456,11 @@ def read_opts(env, cfg, args):
- ('BF_EXPAT_LIB', 'Expat library', ''),
- ('BF_EXPAT_LIBPATH', 'Expat library path', ''),
-
-+ (BoolVariable('WITH_BF_COLAMD', 'Use Colamd if true', True)),
-+ ('BF_COLAMD', 'Colamd base dir', ''),
-+ ('BF_COLAMD_INC', 'Colamd include path', ''),
-+ ('BF_COLAMD_LIB', 'Colamd library', ''),
-+
- (BoolVariable('WITH_BF_JEMALLOC', 'Use jemalloc if true', False)),
- (BoolVariable('WITH_BF_STATICJEMALLOC', 'Staticly link to jemalloc', False)),
- ('BF_JEMALLOC', 'jemalloc base path', ''),
-diff -Npur blender-2.63.orig/extern/CMakeLists.txt blender-2.63/extern/CMakeLists.txt
---- blender-2.63.orig/extern/CMakeLists.txt 2012-05-07 23:21:26.966544809 +0200
-+++ blender-2.63/extern/CMakeLists.txt 2012-05-07 23:24:02.363542061 +0200
-@@ -26,8 +26,6 @@
- # Otherwise we get warnings here that we cant fix in external projects
- remove_strict_flags()
-
--add_subdirectory(colamd)
--
- if(WITH_MOD_CLOTH_ELTOPO)
- add_subdirectory(eltopo)
- endif()
-diff -Npur blender-2.63.orig/extern/libmv/bundle.sh blender-2.63/extern/libmv/bundle.sh
---- blender-2.63.orig/extern/libmv/bundle.sh 2012-05-07 23:21:26.960544809 +0200
-+++ blender-2.63/extern/libmv/bundle.sh 2012-05-07 23:24:53.085541163 +0200
-@@ -122,13 +122,13 @@ set(INC
- .
- third_party/ssba
- third_party/ldl/Include
-- ../colamd/Include
- )
-
- set(INC_SYS
- /usr/include/eigen3
- \${PNG_INCLUDE_DIR}
- \${ZLIB_INCLUDE_DIRS}
-+ \${COLAMD_INCLUDE_DIRS}
- )
-
-
-@@ -247,6 +247,7 @@ $src
- incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-+incs += ' ' + env['BF_COLAMD_INC']
-
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
-@@ -276,7 +277,7 @@ else:
- ccflags_libmv += Split(env['REL_CCFLAGS'])
- cxxflags_libmv += Split(env['REL_CXXFLAGS'])
-
--incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
-+incs += ' ./third_party/ssba ./third_party/ldl/Include'
-
- env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
- EOF
-diff -Npur blender-2.63.orig/extern/libmv/CMakeLists.txt blender-2.63/extern/libmv/CMakeLists.txt
---- blender-2.63.orig/extern/libmv/CMakeLists.txt 2012-05-07 23:21:26.956544809 +0200
-+++ blender-2.63/extern/libmv/CMakeLists.txt 2012-05-07 23:25:16.647540750 +0200
-@@ -30,13 +30,13 @@ set(INC
- .
- third_party/ssba
- third_party/ldl/Include
-- ../colamd/Include
- )
-
- set(INC_SYS
- /usr/include/eigen3
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
-+ ${COLAMD_INCLUDE_DIRS}
- )
-
-
-diff -Npur blender-2.63.orig/extern/libmv/SConscript blender-2.63/extern/libmv/SConscript
---- blender-2.63.orig/extern/libmv/SConscript 2012-05-07 23:21:26.956544809 +0200
-+++ blender-2.63/extern/libmv/SConscript 2012-05-07 23:25:46.051540228 +0200
-@@ -33,6 +33,7 @@ src += env.Glob('third_party/ssba/Math/*
- incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-+incs += ' ' + env['BF_COLAMD_INC']
-
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
-@@ -62,6 +63,6 @@ else:
- ccflags_libmv += Split(env['REL_CCFLAGS'])
- cxxflags_libmv += Split(env['REL_CXXFLAGS'])
-
--incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
-+incs += ' ./third_party/ssba ./third_party/ldl/Include'
-
- env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
-diff -Npur blender-2.63.orig/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp blender-2.63/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
---- blender-2.63.orig/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-05-07 23:21:26.956544809 +0200
-+++ blender-2.63/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-05-07 23:26:21.833539593 +0200
-@@ -21,7 +21,7 @@ with SSBA. If not, see <http://www.gnu.o
-
- #if defined(V3DLIB_ENABLE_SUITESPARSE)
- //# include "COLAMD/Include/colamd.h"
--# include "colamd.h"
-+# include <colamd.h>
- extern "C"
- {
- //# include "LDL/Include/ldl.h"
-diff -Npur blender-2.63.orig/extern/SConscript blender-2.63/extern/SConscript
---- blender-2.63.orig/extern/SConscript 2012-05-07 23:21:26.965544809 +0200
-+++ blender-2.63/extern/SConscript 2012-05-07 23:26:39.735539279 +0200
-@@ -2,8 +2,6 @@
-
- Import('env')
-
--SConscript(['colamd/SConscript'])
--
- if env['WITH_BF_GAMEENGINE']:
- SConscript(['recastnavigation/SConscript'])
-
-diff -Npur blender-2.63.orig/intern/opennl/CMakeLists.txt blender-2.63/intern/opennl/CMakeLists.txt
---- blender-2.63.orig/intern/opennl/CMakeLists.txt 2012-05-07 23:21:27.282544803 +0200
-+++ blender-2.63/intern/opennl/CMakeLists.txt 2012-05-07 23:27:00.719538907 +0200
-@@ -40,11 +40,10 @@ add_definitions(
- set(INC
- extern
- superlu
-- ../../extern/colamd/Include
- )
-
- set(INC_SYS
--
-+ /usr/include
- )
-
- set(SRC
-diff -Npur blender-2.63.orig/intern/opennl/SConscript blender-2.63/intern/opennl/SConscript
---- blender-2.63.orig/intern/opennl/SConscript 2012-05-07 23:21:27.281544803 +0200
-+++ blender-2.63/intern/opennl/SConscript 2012-05-07 23:27:25.132538477 +0200
-@@ -3,7 +3,7 @@ Import ('env')
-
- sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c')
-
--incs = 'extern superlu ../../extern/colamd/Include'
-+incs = 'extern superlu /usr/include'
-
- if (env['OURPLATFORM'] in ('win32-mingw', 'win64-mingw')):
- env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
-diff -Npur blender-2.63.orig/intern/opennl/superlu/get_perm_c.c blender-2.63/intern/opennl/superlu/get_perm_c.c
---- blender-2.63.orig/intern/opennl/superlu/get_perm_c.c 2012-05-07 23:21:27.281544803 +0200
-+++ blender-2.63/intern/opennl/superlu/get_perm_c.c 2012-05-07 23:27:42.876538164 +0200
-@@ -10,7 +10,7 @@
- */
-
- #include "ssp_defs.h"
--#include "colamd.h"
-+#include <colamd.h>
-
- extern int genmmd_(int *, int *, int *, int *, int *, int *, int *,
- int *, int *, int *, int *, int *);
diff --git a/media-gfx/blender/files/blender-2.63-collada.patch b/media-gfx/blender/files/blender-2.63-collada.patch
deleted file mode 100644
index 7823109..0000000
--- a/media-gfx/blender/files/blender-2.63-collada.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/blender/collada/SConscript 2012-01-16 19:04:02.438027832 +0100
-+++ source/blender/collada/SConscript 2012-01-16 19:03:59.787060970 +0100
-@@ -34,7 +34,7 @@
- if env['OURPLATFORM']=='darwin':
- incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
- else:
-- incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
-+ incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
-
- if env['BF_BUILDINFO']:
- defs.append('WITH_BUILDINFO')
diff --git a/media-gfx/blender/files/blender-2.63-desktop.patch b/media-gfx/blender/files/blender-2.63-desktop.patch
deleted file mode 100644
index d325055..0000000
--- a/media-gfx/blender/files/blender-2.63-desktop.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Npur blender-2.63.orig/release/freedesktop/blender.desktop blender-2.63/release/freedesktop/blender.desktop
---- blender-2.63.orig/release/freedesktop/blender.desktop 2012-05-08 12:07:59.399731724 +0200
-+++ blender-2.63/release/freedesktop/blender.desktop 2012-05-08 12:09:29.185730134 +0200
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Blender
-+Name=Blender-2.63
- GenericName=3D modeller
- GenericName[es]=modelador 3D
- GenericName[de]=3D-Modellierer
-@@ -8,8 +8,9 @@ GenericName[ru]=Редактор 3D-мо
- Comment=3D modeling, animation, rendering and post-production
- Comment[es]=modelado 3D, animación, renderizado y post-producción
- Comment[de]=3D-Modellierung, Animation, Rendering und Nachbearbeitung
--Exec=blender
--Icon=blender
-+Comment[fr]=modeleur 3D, animation, rendu et post-production
-+Exec=blender-2.63 %f
-+Icon=blender-2.63
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;
diff --git a/media-gfx/blender/files/blender-2.63-doxyfile.patch b/media-gfx/blender/files/blender-2.63-doxyfile.patch
deleted file mode 100644
index e7d045a..0000000
--- a/media-gfx/blender/files/blender-2.63-doxyfile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Npur blender-2.63.orig/doc/doxygen/Doxyfile blender-2.63/doc/doxygen/Doxyfile
---- blender-2.63.orig/doc/doxygen/Doxyfile 2012-05-07 23:00:09.494567393 +0200
-+++ blender-2.63/doc/doxygen/Doxyfile 2012-05-07 23:00:39.390566856 +0200
-@@ -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
-Les fichiers binaires blender-2.63.orig/doc/doxygen/.Doxyfile.swp et blender-2.63/doc/doxygen/.Doxyfile.swp sont différents.
diff --git a/media-gfx/blender/files/blender-2.63-eigen.patch b/media-gfx/blender/files/blender-2.63-eigen.patch
deleted file mode 100644
index 1990e0c..0000000
--- a/media-gfx/blender/files/blender-2.63-eigen.patch
+++ /dev/null
@@ -1,556 +0,0 @@
-diff -Npur blender-2.63.orig/extern/libmv/bundle.sh blender-2.63/extern/libmv/bundle.sh
---- blender-2.63.orig/extern/libmv/bundle.sh 2012-05-07 23:04:15.864563037 +0200
-+++ blender-2.63/extern/libmv/bundle.sh 2012-05-07 23:05:15.112561992 +0200
-@@ -120,13 +120,13 @@ cat > CMakeLists.txt << EOF
-
- set(INC
- .
-- ../Eigen3
- third_party/ssba
- third_party/ldl/Include
- ../colamd/Include
- )
-
- set(INC_SYS
-+ /usr/include/eigen3
- \${PNG_INCLUDE_DIR}
- \${ZLIB_INCLUDE_DIRS}
- )
-@@ -244,7 +244,7 @@ defs.append('GOOGLE_GLOG_DLL_DECL=')
- src = env.Glob("*.cpp")
- $src
-
--incs = '. ../Eigen3'
-+incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-
-diff -Npur blender-2.63.orig/extern/libmv/CMakeLists.txt blender-2.63/extern/libmv/CMakeLists.txt
---- blender-2.63.orig/extern/libmv/CMakeLists.txt 2012-05-07 23:04:15.860563037 +0200
-+++ blender-2.63/extern/libmv/CMakeLists.txt 2012-05-07 23:05:34.148561654 +0200
-@@ -28,13 +28,13 @@
-
- set(INC
- .
-- ../Eigen3
- third_party/ssba
- third_party/ldl/Include
- ../colamd/Include
- )
-
- set(INC_SYS
-+ /usr/include/eigen3
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
- )
-diff -Npur blender-2.63.orig/extern/libmv/SConscript blender-2.63/extern/libmv/SConscript
---- blender-2.63.orig/extern/libmv/SConscript 2012-05-07 23:04:15.860563037 +0200
-+++ blender-2.63/extern/libmv/SConscript 2012-05-07 23:05:51.208561352 +0200
-@@ -30,7 +30,7 @@ src += env.Glob('third_party/ldl/Source/
- src += env.Glob('third_party/ssba/Geometry/*.cpp')
- src += env.Glob('third_party/ssba/Math/*.cpp')
-
--incs = '. ../Eigen3'
-+incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-
-diff -Npur blender-2.63.orig/intern/dualcon/SConscript blender-2.63/intern/dualcon/SConscript
---- blender-2.63.orig/intern/dualcon/SConscript 2012-05-07 23:04:16.045563034 +0200
-+++ blender-2.63/intern/dualcon/SConscript 2012-05-07 23:10:26.690556512 +0200
-@@ -3,7 +3,7 @@ Import ('env')
-
- sources = env.Glob('intern/*.cpp')
-
--incs = '. ../../extern/Eigen3'
-+incs = '. /usr/include/eigen3'
- defs = ''
-
- env.BlenderLib ('bf_intern_dualcon', sources, Split(incs), Split(defs), libtype=['intern'], priority=[100] )
-Les fichiers binaires blender-2.63.orig/intern/dualcon/.SConscript.swp et blender-2.63/intern/dualcon/.SConscript.swp sont différents.
-diff -Npur blender-2.63.orig/intern/itasc/CMakeLists.txt blender-2.63/intern/itasc/CMakeLists.txt
---- blender-2.63.orig/intern/itasc/CMakeLists.txt 2012-05-07 23:04:16.048563034 +0200
-+++ blender-2.63/intern/itasc/CMakeLists.txt 2012-05-07 23:07:37.219559480 +0200
-@@ -24,11 +24,11 @@
- # ***** END GPL LICENSE BLOCK *****
-
- set(INC
-- ../../extern/Eigen3
-+
- )
-
- set(INC_SYS
--
-+ /usr/include/eigen3
- )
-
- set(SRC
-@@ -121,201 +121,201 @@ set(SRC
- kdl/framevel.inl
-
- # until we have another user...
-- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h
-- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
-- ../../extern/Eigen3/Eigen/src/misc/Kernel.h
-- ../../extern/Eigen3/Eigen/src/misc/Image.h
-- ../../extern/Eigen3/Eigen/src/misc/Solve.h
-- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h
-- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
-- ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/details.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h
-- ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
-- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
-- ../../extern/Eigen3/Eigen/src/Householder/Householder.h
-- ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
-- ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
-- ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
-- ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
-- ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
-- ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
-- ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
-- ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Translation.h
-- ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Transform.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h
-- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h
-- ../../extern/Eigen3/Eigen/src/LU/Determinant.h
-- ../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
-- ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h
-- ../../extern/Eigen3/Eigen/src/LU/Inverse.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrixBase.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseVector.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/TriangularSolver.h
-- ../../extern/Eigen3/Eigen/src/Sparse/AmbiVector.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseDenseProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseBlock.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseTriangularView.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
-- ../../extern/Eigen3/Eigen/src/Sparse/CoreIterators.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrix.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseAssign.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseSparseProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseDot.h
-- ../../extern/Eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseRedux.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseFuzzy.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseView.h
-- ../../extern/Eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseUtil.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseTranspose.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/CompressedStorage.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
-- ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
-- ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h
-- ../../extern/Eigen3/Eigen/src/Core/Swap.h
-- ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
-- ../../extern/Eigen3/Eigen/src/Core/DenseBase.h
-- ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
-- ../../extern/Eigen3/Eigen/src/Core/ProductBase.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/Stride.h
-- ../../extern/Eigen3/Eigen/src/Core/Matrix.h
-- ../../extern/Eigen3/Eigen/src/Core/Visitor.h
-- ../../extern/Eigen3/Eigen/src/Core/Array.h
-- ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h
-- ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/EigenBase.h
-- ../../extern/Eigen3/Eigen/src/Core/Random.h
-- ../../extern/Eigen3/Eigen/src/Core/Redux.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/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/BooleanRedux.h
-- ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
-- ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Memory.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Meta.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Constants.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Macros.h
-- ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
-- ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
-- ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
-- ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h
-- ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h
-- ../../extern/Eigen3/Eigen/src/Core/Transpositions.h
-- ../../extern/Eigen3/Eigen/src/Core/Select.h
-- ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
-- ../../extern/Eigen3/Eigen/src/Core/Dot.h
-- ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
-- ../../extern/Eigen3/Eigen/src/Core/Product.h
-- ../../extern/Eigen3/Eigen/src/Core/Transpose.h
-- ../../extern/Eigen3/Eigen/src/Core/Block.h
-- ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
-- ../../extern/Eigen3/Eigen/src/Core/MapBase.h
-- ../../extern/Eigen3/Eigen/src/Core/NoAlias.h
-- ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
-- ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
-- ../../extern/Eigen3/Eigen/src/Core/IO.h
-- ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/Reverse.h
-- ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h
-- ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h
-- ../../extern/Eigen3/Eigen/src/Core/StableNorm.h
-- ../../extern/Eigen3/Eigen/src/Core/NumTraits.h
-- ../../extern/Eigen3/Eigen/src/Core/Map.h
-- ../../extern/Eigen3/Eigen/src/Core/Functors.h
-- ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h
-- ../../extern/Eigen3/Eigen/src/Core/NestByValue.h
-- ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
-- ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h
-- ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h
-- ../../extern/Eigen3/Eigen/src/Core/Diagonal.h
-- ../../extern/Eigen3/Eigen/src/Core/Replicate.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
-- ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
-- ../../extern/Eigen3/Eigen/src/Core/Assign.h
-- ../../extern/Eigen3/Eigen/src/Core/Flagged.h
-- ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h
-- ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
-+ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/BlockMethods.h
-+ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
-+ /usr/include/eigen3/Eigen/src/misc/Kernel.h
-+ /usr/include/eigen3/Eigen/src/misc/Image.h
-+ /usr/include/eigen3/Eigen/src/misc/Solve.h
-+ /usr/include/eigen3/Eigen/src/QR/HouseholderQR.h
-+ /usr/include/eigen3/Eigen/src/QR/ColPivHouseholderQR.h
-+ /usr/include/eigen3/Eigen/src/QR/FullPivHouseholderQR.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/details.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/StdList.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/StdDeque.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/StdVector.h
-+ /usr/include/eigen3/Eigen/src/SVD/UpperBidiagonalization.h
-+ /usr/include/eigen3/Eigen/src/SVD/JacobiSVD.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/RealSchur.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Jacobi/Jacobi.h
-+ /usr/include/eigen3/Eigen/src/Householder/Householder.h
-+ /usr/include/eigen3/Eigen/src/Householder/BlockHouseholder.h
-+ /usr/include/eigen3/Eigen/src/Householder/HouseholderSequence.h
-+ /usr/include/eigen3/Eigen/src/Geometry/RotationBase.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Rotation2D.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Homogeneous.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Hyperplane.h
-+ /usr/include/eigen3/Eigen/src/Geometry/EulerAngles.h
-+ /usr/include/eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
-+ /usr/include/eigen3/Eigen/src/Geometry/ParametrizedLine.h
-+ /usr/include/eigen3/Eigen/src/Geometry/OrthoMethods.h
-+ /usr/include/eigen3/Eigen/src/Geometry/AngleAxis.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Umeyama.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Scaling.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Translation.h
-+ /usr/include/eigen3/Eigen/src/Geometry/AlignedBox.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Transform.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Quaternion.h
-+ /usr/include/eigen3/Eigen/src/LU/PartialPivLU.h
-+ /usr/include/eigen3/Eigen/src/LU/Determinant.h
-+ /usr/include/eigen3/Eigen/src/LU/arch/Inverse_SSE.h
-+ /usr/include/eigen3/Eigen/src/LU/FullPivLU.h
-+ /usr/include/eigen3/Eigen/src/LU/Inverse.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrixBase.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseVector.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/TriangularSolver.h
-+ /usr/include/eigen3/Eigen/src/Sparse/AmbiVector.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseDenseProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseBlock.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseTriangularView.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
-+ /usr/include/eigen3/Eigen/src/Sparse/CoreIterators.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrix.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseAssign.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseSparseProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseDot.h
-+ /usr/include/eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseRedux.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseFuzzy.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseView.h
-+ /usr/include/eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseUtil.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseTranspose.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/CompressedStorage.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Cwise.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/QR.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Lazy.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Memory.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/SVD.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/VectorBlock.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Meta.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Macros.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/LeastSquares.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/LU.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Block.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/All.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Minor.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/MathFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/SelfAdjointView.h
-+ /usr/include/eigen3/Eigen/src/Core/MatrixBase.h
-+ /usr/include/eigen3/Eigen/src/Core/Swap.h
-+ /usr/include/eigen3/Eigen/src/Core/DenseCoeffsBase.h
-+ /usr/include/eigen3/Eigen/src/Core/DenseBase.h
-+ /usr/include/eigen3/Eigen/src/Core/GlobalFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/ProductBase.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseBinaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/Stride.h
-+ /usr/include/eigen3/Eigen/src/Core/Matrix.h
-+ /usr/include/eigen3/Eigen/src/Core/Visitor.h
-+ /usr/include/eigen3/Eigen/src/Core/Array.h
-+ /usr/include/eigen3/Eigen/src/Core/ReturnByValue.h
-+ /usr/include/eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/EigenBase.h
-+ /usr/include/eigen3/Eigen/src/Core/Random.h
-+ /usr/include/eigen3/Eigen/src/Core/Redux.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/Default/Settings.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/NEON/Complex.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/Complex.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/BooleanRedux.h
-+ /usr/include/eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
-+ /usr/include/eigen3/Eigen/src/Core/util/BlasUtil.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Memory.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Meta.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Constants.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Macros.h
-+ /usr/include/eigen3/Eigen/src/Core/util/ForwardDeclarations.h
-+ /usr/include/eigen3/Eigen/src/Core/util/StaticAssert.h
-+ /usr/include/eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
-+ /usr/include/eigen3/Eigen/src/Core/util/XprHelper.h
-+ /usr/include/eigen3/Eigen/src/Core/VectorBlock.h
-+ /usr/include/eigen3/Eigen/src/Core/Transpositions.h
-+ /usr/include/eigen3/Eigen/src/Core/Select.h
-+ /usr/include/eigen3/Eigen/src/Core/BandMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryView.h
-+ /usr/include/eigen3/Eigen/src/Core/Dot.h
-+ /usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/Product.h
-+ /usr/include/eigen3/Eigen/src/Core/Transpose.h
-+ /usr/include/eigen3/Eigen/src/Core/Block.h
-+ /usr/include/eigen3/Eigen/src/Core/ArrayWrapper.h
-+ /usr/include/eigen3/Eigen/src/Core/MapBase.h
-+ /usr/include/eigen3/Eigen/src/Core/NoAlias.h
-+ /usr/include/eigen3/Eigen/src/Core/ForceAlignedAccess.h
-+ /usr/include/eigen3/Eigen/src/Core/PlainObjectBase.h
-+ /usr/include/eigen3/Eigen/src/Core/IO.h
-+ /usr/include/eigen3/Eigen/src/Core/DiagonalMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/Reverse.h
-+ /usr/include/eigen3/Eigen/src/Core/Fuzzy.h
-+ /usr/include/eigen3/Eigen/src/Core/DenseStorage.h
-+ /usr/include/eigen3/Eigen/src/Core/StableNorm.h
-+ /usr/include/eigen3/Eigen/src/Core/NumTraits.h
-+ /usr/include/eigen3/Eigen/src/Core/Map.h
-+ /usr/include/eigen3/Eigen/src/Core/Functors.h
-+ /usr/include/eigen3/Eigen/src/Core/PermutationMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/ArrayBase.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseNullaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/SolveTriangular.h
-+ /usr/include/eigen3/Eigen/src/Core/NestByValue.h
-+ /usr/include/eigen3/Eigen/src/Core/DiagonalProduct.h
-+ /usr/include/eigen3/Eigen/src/Core/CommaInitializer.h
-+ /usr/include/eigen3/Eigen/src/Core/MathFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/Diagonal.h
-+ /usr/include/eigen3/Eigen/src/Core/Replicate.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointProduct.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/Parallelizer.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
-+ /usr/include/eigen3/Eigen/src/Core/TriangularMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/VectorwiseOp.h
-+ /usr/include/eigen3/Eigen/src/Core/Assign.h
-+ /usr/include/eigen3/Eigen/src/Core/Flagged.h
-+ /usr/include/eigen3/Eigen/src/Cholesky/LDLT.h
-+ /usr/include/eigen3/Eigen/src/Cholesky/LLT.h
- )
-
- if(WIN32)
-diff -Npur blender-2.63.orig/intern/itasc/SConscript blender-2.63/intern/itasc/SConscript
---- blender-2.63.orig/intern/itasc/SConscript 2012-05-07 23:04:16.048563034 +0200
-+++ blender-2.63/intern/itasc/SConscript 2012-05-07 23:08:05.272558981 +0200
-@@ -5,7 +5,7 @@ sources = env.Glob('*.cpp')
- sources += env.Glob('kdl/*.cpp')
- sources += env.Glob('kdl/utilities/*.cpp')
-
--incs = '. ../../extern/Eigen3'
-+incs = '. /usr/include/eigen3'
-
- defs = []
-
-diff -Npur blender-2.63.orig/source/blender/ikplugin/CMakeLists.txt blender-2.63/source/blender/ikplugin/CMakeLists.txt
---- blender-2.63.orig/source/blender/ikplugin/CMakeLists.txt 2012-05-07 23:04:16.028563034 +0200
-+++ blender-2.63/source/blender/ikplugin/CMakeLists.txt 2012-05-07 23:08:47.476558205 +0200
-@@ -49,9 +49,11 @@ set(SRC
- if(WITH_IK_ITASC)
- add_definitions(-DWITH_IK_ITASC)
- list(APPEND INC
-- ../../../extern/Eigen3
- ../../../intern/itasc
- )
-+ list(APPEND INC_SYS
-+ /usr/include/eigen3
-+ )
- list(APPEND SRC
- intern/itasc_plugin.cpp
- )
-diff -Npur blender-2.63.orig/source/blender/ikplugin/SConscript blender-2.63/source/blender/ikplugin/SConscript
---- blender-2.63.orig/source/blender/ikplugin/SConscript 2012-05-07 23:04:16.028563034 +0200
-+++ blender-2.63/source/blender/ikplugin/SConscript 2012-05-07 23:09:13.004557784 +0200
-@@ -4,7 +4,7 @@ defs = []
- sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
-
- incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
--incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3'
-+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen3'
-
- defs.append('WITH_IK_ITASC')
-
-diff -Npur blender-2.63.orig/source/gameengine/Converter/CMakeLists.txt blender-2.63/source/gameengine/Converter/CMakeLists.txt
---- blender-2.63.orig/source/gameengine/Converter/CMakeLists.txt 2012-05-07 23:04:15.895563037 +0200
-+++ blender-2.63/source/gameengine/Converter/CMakeLists.txt 2012-05-07 23:09:46.375557194 +0200
-@@ -50,7 +50,6 @@ set(INC
- ../../blender/makesrna
- ../../blender/windowmanager
- ../../../extern/bullet2/src
-- ../../../extern/Eigen3
- ../../../intern/container
- ../../../intern/guardedalloc
- ../../../intern/moto/include
-@@ -59,7 +58,7 @@ set(INC
- )
-
- set(INC_SYS
--
-+ /usr/include/eigen3
- )
-
- set(SRC
-diff -Npur blender-2.63.orig/source/gameengine/Converter/SConscript blender-2.63/source/gameengine/Converter/SConscript
---- blender-2.63.orig/source/gameengine/Converter/SConscript 2012-05-07 23:04:15.895563037 +0200
-+++ blender-2.63/source/gameengine/Converter/SConscript 2012-05-07 23:10:09.611556783 +0200
-@@ -21,7 +21,7 @@ incs += ' #source/blender/windowmanager'
- incs += ' #source/blender/makesrna'
- incs += ' #source/blender/ikplugin'
- incs += ' #extern/recastnavigation/Detour/Include'
--incs += ' #extern/Eigen3'
-+incs += ' /usr/include/eigen3'
-
- incs += ' ' + env['BF_BULLET_INC']
-
diff --git a/media-gfx/blender/files/blender-2.63-enable_site_module.patch b/media-gfx/blender/files/blender-2.63-enable_site_module.patch
deleted file mode 100644
index 2d6ca00..0000000
--- a/media-gfx/blender/files/blender-2.63-enable_site_module.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Npur blender-2.63.orig/source/blender/python/intern/bpy_interface.c blender-2.63/source/blender/python/intern/bpy_interface.c
---- blender-2.63.orig/source/blender/python/intern/bpy_interface.c 2012-05-08 00:14:54.141488111 +0200
-+++ blender-2.63/source/blender/python/intern/bpy_interface.c 2012-05-08 00:15:14.861487739 +0200
-@@ -241,11 +241,6 @@ void BPY_python_start(int argc, const ch
- * blender is utf-8 too - campbell */
- BLI_setenv("PYTHONIOENCODING", "utf-8:surrogateescape");
-
-- /* Python 3.2 now looks for '2.xx/python/include/python3.2d/pyconfig.h' to
-- * parse from the 'sysconfig' module which is used by 'site',
-- * so for now disable site. alternatively we could copy the file. */
-- Py_NoSiteFlag = 1;
--
- Py_Initialize();
-
- // PySys_SetArgv(argc, argv); // broken in py3, not a huge deal
-diff -Npur blender-2.63.orig/source/gameengine/Ketsji/KX_PythonInit.cpp blender-2.63/source/gameengine/Ketsji/KX_PythonInit.cpp
---- blender-2.63.orig/source/gameengine/Ketsji/KX_PythonInit.cpp 2012-05-08 00:14:54.118488110 +0200
-+++ blender-2.63/source/gameengine/Ketsji/KX_PythonInit.cpp 2012-05-08 00:15:23.305487596 +0200
-@@ -1848,7 +1848,6 @@ PyObject* initGamePlayerPythonScripting(
- STR_String pname = progname;
- Py_SetProgramName(pname.Ptr());
- #endif
-- Py_NoSiteFlag=1;
- Py_FrozenFlag=1;
-
- /* must run before python initializes */
-@@ -1929,7 +1928,6 @@ PyObject* initGamePythonScripting(const
- STR_String pname = progname;
- Py_SetProgramName(pname.Ptr());
- #endif
-- Py_NoSiteFlag=1;
- Py_FrozenFlag=1;
-
- #ifdef WITH_AUDASPACE
diff --git a/media-gfx/blender/files/blender-2.63-glew.patch b/media-gfx/blender/files/blender-2.63-glew.patch
deleted file mode 100644
index 736bedd..0000000
--- a/media-gfx/blender/files/blender-2.63-glew.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Npur blender-2.63.orig/CMakeLists.txt blender-2.63/CMakeLists.txt
---- blender-2.63.orig/CMakeLists.txt 2012-05-07 23:02:18.166565118 +0200
-+++ blender-2.63/CMakeLists.txt 2012-05-07 23:02:45.907564652 +0200
-@@ -160,7 +160,7 @@ unset(PLATFORM_DEFAULT)
- if(UNIX AND NOT APPLE)
- option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
- option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON)
-- option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
-+ option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" OFF)
- option(WITH_XDG_USER_DIRS "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
- mark_as_advanced(WITH_XDG_USER_DIRS)
-
-diff -Npur blender-2.63.orig/extern/CMakeLists.txt blender-2.63/extern/CMakeLists.txt
---- blender-2.63.orig/extern/CMakeLists.txt 2012-05-07 23:02:18.134565119 +0200
-+++ blender-2.63/extern/CMakeLists.txt 2012-05-07 23:02:58.458564406 +0200
-@@ -40,10 +40,6 @@ if(WITH_BINRELOC)
- add_subdirectory(binreloc)
- endif()
-
--if(WITH_BUILTIN_GLEW)
-- add_subdirectory(glew)
--endif()
--
- if(WITH_GAMEENGINE)
- add_subdirectory(recastnavigation)
- endif()
-diff -Npur blender-2.63.orig/extern/SConscript blender-2.63/extern/SConscript
---- blender-2.63.orig/extern/SConscript 2012-05-07 23:02:18.132565119 +0200
-+++ blender-2.63/extern/SConscript 2012-05-07 23:03:14.094564130 +0200
-@@ -2,7 +2,6 @@
-
- Import('env')
-
--SConscript(['glew/SConscript'])
- SConscript(['colamd/SConscript'])
-
- if env['WITH_BF_GAMEENGINE']:
-diff -Npur blender-2.63.orig/source/blender/editors/include/BIF_gl.h blender-2.63/source/blender/editors/include/BIF_gl.h
---- blender-2.63.orig/source/blender/editors/include/BIF_gl.h 2012-05-07 23:02:18.433565114 +0200
-+++ blender-2.63/source/blender/editors/include/BIF_gl.h 2012-05-07 23:03:35.555563750 +0200
-@@ -33,7 +33,7 @@
- #ifndef __BIF_GL_H__
- #define __BIF_GL_H__
-
--#include "GL/glew.h"
-+#include <GL/glew.h>
-
- /*
- * these should be phased out. cpack should be replaced in
diff --git a/media-gfx/blender/files/blender-2.63-insecure.desktop b/media-gfx/blender/files/blender-2.63-insecure.desktop
deleted file mode 100644
index 5658065..0000000
--- a/media-gfx/blender/files/blender-2.63-insecure.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Name=Blender-2.63 (reduced security)
-GenericName=3D modeller (reduced security)
-GenericName[es]=modelador 3D (reduced security)
-GenericName[de]=3D Modellierer (weniger Sicherheit)
-GenericName[fr]=modeleur 3D (reduced security)
-GenericName[ru]=Редактор 3D-моделей (reduced security)
-Comment=3D modeling, animation, rendering and post-production
-Comment[es]=modelado 3D, animación, renderizado y post-producción
-Comment[de]=3D-Modellierung, Animation, Rendering und Nachbearbeitung
-Comment[fr]=modeleur 3D, animation, rendu et post-production
-Exec=blender-2.63 --enable-autoexec %f
-Icon=blender-2.63
-Terminal=false
-Type=Application
-Categories=Graphics;3DGraphics;
-MimeType=application/x-blender;
diff --git a/media-gfx/blender/files/blender-2.63-opencollada-debug.patch b/media-gfx/blender/files/blender-2.63-opencollada-debug.patch
deleted file mode 100644
index 0798cfd..0000000
--- a/media-gfx/blender/files/blender-2.63-opencollada-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Npur blender-2.63.orig/build_files/scons/tools/Blender.py blender-2.63/build_files/scons/tools/Blender.py
---- blender-2.63.orig/build_files/scons/tools/Blender.py 2012-05-08 00:15:58.091486980 +0200
-+++ blender-2.63/build_files/scons/tools/Blender.py 2012-05-08 00:17:01.805485854 +0200
-@@ -276,10 +276,7 @@ def setup_syslibs(lenv):
- syslibs += Split(lenv['BF_PTHREADS_LIB'])
- if lenv['WITH_BF_COLLADA']:
- syslibs.append(lenv['BF_PCRE_LIB'])
-- if lenv['BF_DEBUG'] and (lenv['OURPLATFORM'] != 'linux'):
-- syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])]
-- else:
-- syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
-+ syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
- syslibs.append(lenv['BF_EXPAT_LIB'])
- if lenv['WITH_BF_COLAMD']:
- syslibs += Split(lenv['BF_COLAMD_LIB'])
diff --git a/media-gfx/blender/files/blender-2.63a-bullet.patch b/media-gfx/blender/files/blender-2.63a-bullet.patch
deleted file mode 100644
index 19465c4..0000000
--- a/media-gfx/blender/files/blender-2.63a-bullet.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-diff -Npur blender-2.63a.orig/build_files/scons/tools/Blender.py blender-2.63a/build_files/scons/tools/Blender.py
---- blender-2.63a.orig/build_files/scons/tools/Blender.py 2012-06-05 10:10:16.142793179 +0200
-+++ blender-2.63a/build_files/scons/tools/Blender.py 2012-06-05 10:11:26.418791934 +0200
-@@ -270,6 +270,8 @@ def setup_syslibs(lenv):
- syslibs += Split(lenv['BF_SDL_LIB'])
- if not lenv['WITH_BF_STATICOPENGL']:
- syslibs += Split(lenv['BF_OPENGL_LIB'])
-+ if lenv['WITH_BF_BULLET']:
-+ syslibs += Split(lenv['BF_BULLET_LIB'])
- if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross', 'win64-vc', 'win64-mingw'):
- syslibs += Split(lenv['BF_PTHREADS_LIB'])
- if lenv['WITH_BF_COLLADA']:
-diff -Npur blender-2.63a.orig/doc/doxygen/Doxyfile blender-2.63a/doc/doxygen/Doxyfile
---- blender-2.63a.orig/doc/doxygen/Doxyfile 2012-06-05 10:10:16.120793179 +0200
-+++ blender-2.63a/doc/doxygen/Doxyfile 2012-06-05 10:11:46.646791579 +0200
-@@ -617,8 +617,7 @@ INPUT = doxygen.main \
- doxygen.intern \
- doxygen.extern \
- ../../source \
-- ../../intern \
-- ../../extern/bullet2
-+ ../../intern
-
- # This tag can be used to specify the character encoding of the source files
- # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-diff -Npur blender-2.63a.orig/extern/CMakeLists.txt blender-2.63a/extern/CMakeLists.txt
---- blender-2.63a.orig/extern/CMakeLists.txt 2012-06-05 10:10:16.139793179 +0200
-+++ blender-2.63a/extern/CMakeLists.txt 2012-06-05 10:12:10.840791151 +0200
-@@ -28,10 +28,6 @@ remove_strict_flags()
-
- add_subdirectory(colamd)
-
--if(WITH_BULLET)
-- add_subdirectory(bullet2)
--endif()
--
- if(WITH_MOD_CLOTH_ELTOPO)
- add_subdirectory(eltopo)
- endif()
-diff -Npur blender-2.63a.orig/extern/SConscript blender-2.63a/extern/SConscript
---- blender-2.63a.orig/extern/SConscript 2012-06-05 10:10:16.137793179 +0200
-+++ blender-2.63a/extern/SConscript 2012-06-05 10:12:20.900790970 +0200
-@@ -10,9 +10,6 @@ if env['WITH_BF_GAMEENGINE']:
- if env['WITH_BF_ELTOPO']:
- SConscript(['eltopo/SConscript'])
-
--if env['WITH_BF_BULLET']:
-- SConscript(['bullet2/src/SConscript'])
--
- if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '':
- SConscript(['libredcode/SConscript'])
-
-diff -Npur blender-2.63a.orig/intern/smoke/CMakeLists.txt blender-2.63a/intern/smoke/CMakeLists.txt
---- blender-2.63a.orig/intern/smoke/CMakeLists.txt 2012-06-05 10:10:16.425793174 +0200
-+++ blender-2.63a/intern/smoke/CMakeLists.txt 2012-06-05 10:14:32.995788638 +0200
-@@ -26,10 +26,10 @@
- set(INC
- intern
- ../memutil
-- ../../extern/bullet2/src
- )
-
- set(INC_SYS
-+ /usr/include/bullet
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
- )
-diff -Npur blender-2.63a.orig/intern/smoke/SConscript blender-2.63a/intern/smoke/SConscript
---- blender-2.63a.orig/intern/smoke/SConscript 2012-06-05 10:10:16.425793174 +0200
-+++ blender-2.63a/intern/smoke/SConscript 2012-06-05 10:15:08.614788006 +0200
-@@ -13,7 +13,7 @@ if env['WITH_BF_OPENMP']:
- defs += ' PARALLEL=1'
-
- incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC']
--incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc '
-+incs += ' intern /usr/include/bullet ../memutil ../guardealloc '
-
- if env['WITH_BF_FFTW3']:
- defs += ' WITH_FFTW3'
-diff -Npur blender-2.63a.orig/source/blender/blenkernel/CMakeLists.txt blender-2.63a/source/blender/blenkernel/CMakeLists.txt
---- blender-2.63a.orig/source/blender/blenkernel/CMakeLists.txt 2012-06-05 10:10:16.169793179 +0200
-+++ blender-2.63a/source/blender/blenkernel/CMakeLists.txt 2012-06-05 10:16:02.912787046 +0200
-@@ -241,8 +241,8 @@ if(WITH_AUDASPACE)
- endif()
-
- if(WITH_BULLET)
-- list(APPEND INC
-- ../../../extern/bullet2/src
-+ list(APPEND INC_SYS
-+ /usr/include/bullet
- )
- add_definitions(-DUSE_BULLET)
- endif()
-diff -Npur blender-2.63a.orig/source/blender/blenkernel/SConscript blender-2.63a/source/blender/blenkernel/SConscript
---- blender-2.63a.orig/source/blender/blenkernel/SConscript 2012-06-05 10:10:16.169793179 +0200
-+++ blender-2.63a/source/blender/blenkernel/SConscript 2012-06-05 10:16:40.599786382 +0200
-@@ -9,7 +9,7 @@ incs += ' ../blenlib ../blenfont ../make
- incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna'
- incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers'
- incs += ' #/intern/iksolver/extern ../blenloader'
--incs += ' #/extern/bullet2/src'
-+incs += ' /usr/include/bullet'
- incs += ' #/intern/opennl/extern #/intern/bsp/extern'
- incs += ' ../gpu #/extern/glew/include'
- incs += ' ../bmesh'
-diff -Npur blender-2.63a.orig/source/gameengine/BlenderRoutines/CMakeLists.txt blender-2.63a/source/gameengine/BlenderRoutines/CMakeLists.txt
---- blender-2.63a.orig/source/gameengine/BlenderRoutines/CMakeLists.txt 2012-06-05 10:10:16.148793179 +0200
-+++ blender-2.63a/source/gameengine/BlenderRoutines/CMakeLists.txt 2012-06-05 10:17:27.687785549 +0200
-@@ -23,7 +23,6 @@ set(INC
- ../../blender/makesdna
- ../../blender/makesrna
- ../../blender/windowmanager
-- ../../../extern/bullet2/src
- ../../../intern/container
- ../../../intern/guardedalloc
- ../../../intern/moto/include
-@@ -33,6 +32,7 @@ set(INC
-
- set(INC_SYS
- ${PTHREADS_INCLUDE_DIRS}
-+ /usr/include/bullet
- )
-
- set(SRC
-diff -Npur blender-2.63a.orig/source/gameengine/Converter/CMakeLists.txt blender-2.63a/source/gameengine/Converter/CMakeLists.txt
---- blender-2.63a.orig/source/gameengine/Converter/CMakeLists.txt 2012-06-05 10:10:16.153793179 +0200
-+++ blender-2.63a/source/gameengine/Converter/CMakeLists.txt 2012-06-05 10:18:05.141784886 +0200
-@@ -49,7 +49,6 @@ set(INC
- ../../blender/makesdna
- ../../blender/makesrna
- ../../blender/windowmanager
-- ../../../extern/bullet2/src
- ../../../intern/container
- ../../../intern/guardedalloc
- ../../../intern/moto/include
-@@ -60,6 +59,7 @@ set(INC
- set(INC_SYS
- ${PTHREADS_INCLUDE_DIRS}
- /usr/include/eigen3
-+ /usr/include/bullet
- )
-
- set(SRC
-diff -Npur blender-2.63a.orig/source/gameengine/Ketsji/CMakeLists.txt blender-2.63a/source/gameengine/Ketsji/CMakeLists.txt
---- blender-2.63a.orig/source/gameengine/Ketsji/CMakeLists.txt 2012-06-05 10:10:16.159793179 +0200
-+++ blender-2.63a/source/gameengine/Ketsji/CMakeLists.txt 2012-06-05 10:19:28.099783421 +0200
-@@ -242,9 +242,11 @@ endif()
-
- if(WITH_BULLET)
- list(APPEND INC
-- ../../../extern/bullet2/src
- ../Physics/Bullet
- )
-+ list(APPEND INC_SYS
-+ /usr/include/bullet
-+ )
- add_definitions(-DUSE_BULLET)
- endif()
-
-diff -Npur blender-2.63a.orig/source/gameengine/Physics/Bullet/CMakeLists.txt blender-2.63a/source/gameengine/Physics/Bullet/CMakeLists.txt
---- blender-2.63a.orig/source/gameengine/Physics/Bullet/CMakeLists.txt 2012-06-05 10:10:16.147793179 +0200
-+++ blender-2.63a/source/gameengine/Physics/Bullet/CMakeLists.txt 2012-06-05 10:21:19.834781445 +0200
-@@ -37,7 +37,6 @@ set(INC
- ../../../blender/blenkernel
- ../../../blender/blenlib
- ../../../blender/makesdna
-- ../../../../extern/bullet2/src
- ../../../../intern/container
- ../../../../intern/guardedalloc
- ../../../../intern/moto/include
-@@ -45,6 +44,7 @@ set(INC
- )
-
- set(INC_SYS
-+ /usr/include/bullet
- ${GLEW_INCLUDE_PATH}
- ${PYTHON_INCLUDE_DIRS}
- )
-diff -Npur blender-2.63a.orig/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp blender-2.63a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
---- blender-2.63a.orig/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2012-06-05 10:10:16.148793179 +0200
-+++ blender-2.63a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2012-06-05 10:20:49.889781975 +0200
-@@ -2804,7 +2804,8 @@ float CcdPhysicsEnvironment::getApplied
-
- void CcdPhysicsEnvironment::exportFile(const char* filename)
- {
-- btDefaultSerializer* serializer = new btDefaultSerializer();
-+ // Workaround bullet-2.77 api change.
-+ btDefaultSerializer* serializer = new btDefaultSerializer(0);
-
-
- for (int i=0;i<m_dynamicsWorld->getNumCollisionObjects();i++)
diff --git a/media-gfx/blender/files/blender-2.63a-colamd.patch b/media-gfx/blender/files/blender-2.63a-colamd.patch
deleted file mode 100644
index f3e19fd..0000000
--- a/media-gfx/blender/files/blender-2.63a-colamd.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-diff -Npur blender-2.63a.orig/build_files/scons/config/linux-config.py blender-2.63a/build_files/scons/config/linux-config.py
---- blender-2.63a.orig/build_files/scons/config/linux-config.py 2012-06-05 10:22:45.044779939 +0200
-+++ blender-2.63a/build_files/scons/config/linux-config.py 2012-06-05 10:23:37.799779017 +0200
-@@ -192,6 +192,11 @@ BF_EXPAT = '/usr'
- BF_EXPAT_LIB = 'expat'
- BF_EXPAT_LIBPATH = '/usr/lib'
-
-+WITH_BF_COLAMD = True
-+BF_COLAMD = '#extern/colamd'
-+BF_COLAMD_INC = '${BF_COLAMD}/include'
-+BF_COLAMD_LIB = 'extern_colamd'
-+
- WITH_BF_JEMALLOC = False
- WITH_BF_STATICJEMALLOC = False
- BF_JEMALLOC = '/usr'
-diff -Npur blender-2.63a.orig/build_files/scons/tools/Blender.py blender-2.63a/build_files/scons/tools/Blender.py
---- blender-2.63a.orig/build_files/scons/tools/Blender.py 2012-06-05 10:22:45.044779939 +0200
-+++ blender-2.63a/build_files/scons/tools/Blender.py 2012-06-05 10:24:13.545778374 +0200
-@@ -281,6 +281,8 @@ def setup_syslibs(lenv):
- else:
- syslibs += Split(lenv['BF_OPENCOLLADA_LIB'])
- syslibs.append(lenv['BF_EXPAT_LIB'])
-+ if lenv['WITH_BF_COLAMD']:
-+ syslibs += Split(lenv['BF_COLAMD_LIB'])
-
- if lenv['WITH_BF_JEMALLOC']:
- if not lenv['WITH_BF_STATICJEMALLOC']:
-diff -Npur blender-2.63a.orig/build_files/scons/tools/btools.py blender-2.63a/build_files/scons/tools/btools.py
---- blender-2.63a.orig/build_files/scons/tools/btools.py 2012-06-05 10:22:45.044779939 +0200
-+++ blender-2.63a/build_files/scons/tools/btools.py 2012-06-05 10:25:35.893776920 +0200
-@@ -126,6 +126,7 @@ def validate_arguments(args, bc):
- 'WITH_BF_FFTW3', 'BF_FFTW3', 'BF_FFTW3_INC', 'BF_FFTW3_LIB', 'BF_FFTW3_LIBPATH', 'WITH_BF_STATICFFTW3', 'BF_FFTW3_LIB_STATIC',
- 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC',
- 'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_INC', 'BF_OPENCOLLADA_LIB', 'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH', 'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH',
-+ 'WITH_BF_COLAMD', 'BF_COLAMD', 'BF_COLAMD_INC', 'BF_COLAMD_LIB',
- 'WITH_BF_PLAYER',
- 'WITH_BF_NOBLENDER',
- 'WITH_BF_BINRELOC',
-@@ -455,6 +456,11 @@ def read_opts(env, cfg, args):
- ('BF_EXPAT_LIB', 'Expat library', ''),
- ('BF_EXPAT_LIBPATH', 'Expat library path', ''),
-
-+ (BoolVariable('WITH_BF_COLAMD', 'Use Colamd if true', True)),
-+ ('BF_COLAMD', 'Colamd base dir', ''),
-+ ('BF_COLAMD_INC', 'Colamd include path', ''),
-+ ('BF_COLAMD_LIB', 'Colamd library', ''),
-+
- (BoolVariable('WITH_BF_JEMALLOC', 'Use jemalloc if true', False)),
- (BoolVariable('WITH_BF_STATICJEMALLOC', 'Staticly link to jemalloc', False)),
- ('BF_JEMALLOC', 'jemalloc base path', ''),
-diff -Npur blender-2.63a.orig/extern/CMakeLists.txt blender-2.63a/extern/CMakeLists.txt
---- blender-2.63a.orig/extern/CMakeLists.txt 2012-06-05 10:22:45.042779939 +0200
-+++ blender-2.63a/extern/CMakeLists.txt 2012-06-05 10:28:25.888773912 +0200
-@@ -26,8 +26,6 @@
- # Otherwise we get warnings here that we cant fix in external projects
- remove_strict_flags()
-
--add_subdirectory(colamd)
--
- if(WITH_MOD_CLOTH_ELTOPO)
- add_subdirectory(eltopo)
- endif()
-diff -Npur blender-2.63a.orig/extern/SConscript blender-2.63a/extern/SConscript
---- blender-2.63a.orig/extern/SConscript 2012-06-05 10:22:45.040779940 +0200
-+++ blender-2.63a/extern/SConscript 2012-06-05 10:30:34.186771644 +0200
-@@ -2,8 +2,6 @@
-
- Import('env')
-
--SConscript(['colamd/SConscript'])
--
- if env['WITH_BF_GAMEENGINE']:
- SConscript(['recastnavigation/SConscript'])
-
-diff -Npur blender-2.63a.orig/extern/libmv/CMakeLists.txt blender-2.63a/extern/libmv/CMakeLists.txt
---- blender-2.63a.orig/extern/libmv/CMakeLists.txt 2012-06-05 10:22:45.031779940 +0200
-+++ blender-2.63a/extern/libmv/CMakeLists.txt 2012-06-05 10:29:01.992773273 +0200
-@@ -30,13 +30,13 @@ set(INC
- .
- third_party/ssba
- third_party/ldl/Include
-- ../colamd/Include
- )
-
- set(INC_SYS
- /usr/include/eigen3
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
-+ ${COLAMD_INCLUDE_DIRS}
- )
-
-
-diff -Npur blender-2.63a.orig/extern/libmv/SConscript blender-2.63a/extern/libmv/SConscript
---- blender-2.63a.orig/extern/libmv/SConscript 2012-06-05 10:22:45.031779940 +0200
-+++ blender-2.63a/extern/libmv/SConscript 2012-06-05 10:29:39.347772616 +0200
-@@ -33,6 +33,7 @@ src += env.Glob('third_party/ssba/Math/*
- incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-+incs += ' ' + env['BF_COLAMD_INC']
-
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
-@@ -62,6 +63,6 @@ else:
- ccflags_libmv += Split(env['REL_CCFLAGS'])
- cxxflags_libmv += Split(env['REL_CXXFLAGS'])
-
--incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
-+incs += ' ./third_party/ssba ./third_party/ldl/Include'
-
- env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
-diff -Npur blender-2.63a.orig/extern/libmv/bundle.sh blender-2.63a/extern/libmv/bundle.sh
---- blender-2.63a.orig/extern/libmv/bundle.sh 2012-06-05 10:22:45.036779940 +0200
-+++ blender-2.63a/extern/libmv/bundle.sh 2012-06-05 10:27:33.882774833 +0200
-@@ -122,13 +122,13 @@ set(INC
- .
- third_party/ssba
- third_party/ldl/Include
-- ../colamd/Include
- )
-
- set(INC_SYS
- /usr/include/eigen3
- \${PNG_INCLUDE_DIR}
- \${ZLIB_INCLUDE_DIRS}
-+ \${COLAMD_INCLUDE_DIRS}
- )
-
-
-@@ -247,6 +247,7 @@ $src
- incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-+incs += ' ' + env['BF_COLAMD_INC']
-
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
-@@ -276,7 +277,7 @@ else:
- ccflags_libmv += Split(env['REL_CCFLAGS'])
- cxxflags_libmv += Split(env['REL_CXXFLAGS'])
-
--incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
-+incs += ' ./third_party/ssba ./third_party/ldl/Include'
-
- env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv )
- EOF
-diff -Npur blender-2.63a.orig/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp blender-2.63a/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
---- blender-2.63a.orig/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-06-05 10:22:45.032779940 +0200
-+++ blender-2.63a/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-06-05 10:30:21.852771858 +0200
-@@ -21,7 +21,7 @@ with SSBA. If not, see <http://www.gnu.o
-
- #if defined(V3DLIB_ENABLE_SUITESPARSE)
- //# include "COLAMD/Include/colamd.h"
--# include "colamd.h"
-+# include <colamd.h>
- extern "C"
- {
- //# include "LDL/Include/ldl.h"
-diff -Npur blender-2.63a.orig/intern/opennl/CMakeLists.txt blender-2.63a/intern/opennl/CMakeLists.txt
---- blender-2.63a.orig/intern/opennl/CMakeLists.txt 2012-06-05 10:22:45.235779936 +0200
-+++ blender-2.63a/intern/opennl/CMakeLists.txt 2012-06-05 10:32:05.148770035 +0200
-@@ -40,11 +40,10 @@ add_definitions(
- set(INC
- extern
- superlu
-- ../../extern/colamd/Include
- )
-
- set(INC_SYS
--
-+ /usr/include
- )
-
- set(SRC
-diff -Npur blender-2.63a.orig/intern/opennl/SConscript blender-2.63a/intern/opennl/SConscript
---- blender-2.63a.orig/intern/opennl/SConscript 2012-06-05 10:22:45.226779934 +0200
-+++ blender-2.63a/intern/opennl/SConscript 2012-06-05 10:32:31.968769563 +0200
-@@ -3,7 +3,7 @@ Import ('env')
-
- sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c')
-
--incs = 'extern superlu ../../extern/colamd/Include'
-+incs = 'extern superlu /usr/include'
-
- if (env['OURPLATFORM'] in ('win32-mingw', 'win64-mingw')):
- env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
-diff -Npur blender-2.63a.orig/intern/opennl/superlu/get_perm_c.c blender-2.63a/intern/opennl/superlu/get_perm_c.c
---- blender-2.63a.orig/intern/opennl/superlu/get_perm_c.c 2012-06-05 10:22:45.225779935 +0200
-+++ blender-2.63a/intern/opennl/superlu/get_perm_c.c 2012-06-05 10:32:53.570769182 +0200
-@@ -10,7 +10,7 @@
- */
-
- #include "ssp_defs.h"
--#include "colamd.h"
-+#include <colamd.h>
-
- extern int genmmd_(int *, int *, int *, int *, int *, int *, int *,
- int *, int *, int *, int *, int *);
diff --git a/media-gfx/blender/files/blender-2.63a-collada.patch b/media-gfx/blender/files/blender-2.63a-collada.patch
deleted file mode 100644
index 7823109..0000000
--- a/media-gfx/blender/files/blender-2.63a-collada.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/blender/collada/SConscript 2012-01-16 19:04:02.438027832 +0100
-+++ source/blender/collada/SConscript 2012-01-16 19:03:59.787060970 +0100
-@@ -34,7 +34,7 @@
- if env['OURPLATFORM']=='darwin':
- incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
- else:
-- incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
-+ incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
-
- if env['BF_BUILDINFO']:
- defs.append('WITH_BUILDINFO')
diff --git a/media-gfx/blender/files/blender-2.63a-desktop.patch b/media-gfx/blender/files/blender-2.63a-desktop.patch
deleted file mode 100644
index 6e72047..0000000
--- a/media-gfx/blender/files/blender-2.63a-desktop.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Npur blender-2.63a.orig/release/freedesktop/blender.desktop blender-2.63a/release/freedesktop/blender.desktop
---- blender-2.63a.orig/release/freedesktop/blender.desktop 2012-05-08 12:07:59.399731724 +0200
-+++ blender-2.63a/release/freedesktop/blender.desktop 2012-05-08 12:09:29.185730134 +0200
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Blender
-+Name=Blender-2.63a
- GenericName=3D modeller
- GenericName[es]=modelador 3D
- GenericName[de]=3D-Modellierer
-@@ -8,8 +8,9 @@ GenericName[ru]=Редактор 3D-мо
- Comment=3D modeling, animation, rendering and post-production
- Comment[es]=modelado 3D, animación, renderizado y post-producción
- Comment[de]=3D-Modellierung, Animation, Rendering und Nachbearbeitung
--Exec=blender
--Icon=blender
-+Comment[fr]=modeleur 3D, animation, rendu et post-production
-+Exec=blender-2.63a %f
-+Icon=blender-2.63a
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;
diff --git a/media-gfx/blender/files/blender-2.63a-eigen.patch b/media-gfx/blender/files/blender-2.63a-eigen.patch
deleted file mode 100644
index b637cb7..0000000
--- a/media-gfx/blender/files/blender-2.63a-eigen.patch
+++ /dev/null
@@ -1,555 +0,0 @@
-diff -Npur blender-2.63a.orig/extern/libmv/CMakeLists.txt blender-2.63a/extern/libmv/CMakeLists.txt
---- blender-2.63a.orig/extern/libmv/CMakeLists.txt 2012-06-05 09:57:12.116807039 +0200
-+++ blender-2.63a/extern/libmv/CMakeLists.txt 2012-06-05 10:00:08.984803912 +0200
-@@ -28,13 +28,13 @@
-
- set(INC
- .
-- ../Eigen3
- third_party/ssba
- third_party/ldl/Include
- ../colamd/Include
- )
-
- set(INC_SYS
-+ /usr/include/eigen3
- ${PNG_INCLUDE_DIR}
- ${ZLIB_INCLUDE_DIRS}
- )
-diff -Npur blender-2.63a.orig/extern/libmv/SConscript blender-2.63a/extern/libmv/SConscript
---- blender-2.63a.orig/extern/libmv/SConscript 2012-06-05 09:57:12.116807039 +0200
-+++ blender-2.63a/extern/libmv/SConscript 2012-06-05 10:00:44.288803286 +0200
-@@ -30,7 +30,7 @@ src += env.Glob('third_party/ldl/Source/
- src += env.Glob('third_party/ssba/Geometry/*.cpp')
- src += env.Glob('third_party/ssba/Math/*.cpp')
-
--incs = '. ../Eigen3'
-+incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-
-diff -Npur blender-2.63a.orig/extern/libmv/bundle.sh blender-2.63a/extern/libmv/bundle.sh
---- blender-2.63a.orig/extern/libmv/bundle.sh 2012-06-05 09:57:12.124807039 +0200
-+++ blender-2.63a/extern/libmv/bundle.sh 2012-06-05 09:59:21.055804758 +0200
-@@ -120,13 +120,13 @@ cat > CMakeLists.txt << EOF
-
- set(INC
- .
-- ../Eigen3
- third_party/ssba
- third_party/ldl/Include
- ../colamd/Include
- )
-
- set(INC_SYS
-+ /usr/include/eigen3
- \${PNG_INCLUDE_DIR}
- \${ZLIB_INCLUDE_DIRS}
- )
-@@ -244,7 +244,7 @@ defs.append('GOOGLE_GLOG_DLL_DECL=')
- src = env.Glob("*.cpp")
- $src
-
--incs = '. ../Eigen3'
-+incs = '. /usr/include/eigen3'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-
-diff -Npur blender-2.63a.orig/intern/dualcon/SConscript blender-2.63a/intern/dualcon/SConscript
---- blender-2.63a.orig/intern/dualcon/SConscript 2012-06-05 09:57:12.654807030 +0200
-+++ blender-2.63a/intern/dualcon/SConscript 2012-06-05 10:01:11.441802807 +0200
-@@ -3,7 +3,7 @@ Import ('env')
-
- sources = env.Glob('intern/*.cpp')
-
--incs = '. ../../extern/Eigen3'
-+incs = '. /usr/include/eigen3'
- defs = ''
-
- env.BlenderLib ('bf_intern_dualcon', sources, Split(incs), Split(defs), libtype=['intern'], priority=[100] )
-diff -Npur blender-2.63a.orig/intern/itasc/CMakeLists.txt blender-2.63a/intern/itasc/CMakeLists.txt
---- blender-2.63a.orig/intern/itasc/CMakeLists.txt 2012-06-05 09:57:12.722807027 +0200
-+++ blender-2.63a/intern/itasc/CMakeLists.txt 2012-06-05 10:03:12.636800665 +0200
-@@ -24,11 +24,11 @@
- # ***** END GPL LICENSE BLOCK *****
-
- set(INC
-- ../../extern/Eigen3
-+
- )
-
- set(INC_SYS
--
-+ /usr/include/eigen3
- )
-
- set(SRC
-@@ -121,201 +121,201 @@ set(SRC
- kdl/framevel.inl
-
- # until we have another user...
-- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h
-- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
-- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
-- ../../extern/Eigen3/Eigen/src/misc/Kernel.h
-- ../../extern/Eigen3/Eigen/src/misc/Image.h
-- ../../extern/Eigen3/Eigen/src/misc/Solve.h
-- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h
-- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
-- ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/details.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
-- ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h
-- ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
-- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
-- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
-- ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
-- ../../extern/Eigen3/Eigen/src/Householder/Householder.h
-- ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
-- ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
-- ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
-- ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
-- ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
-- ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
-- ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
-- ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Translation.h
-- ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Transform.h
-- ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h
-- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h
-- ../../extern/Eigen3/Eigen/src/LU/Determinant.h
-- ../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
-- ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h
-- ../../extern/Eigen3/Eigen/src/LU/Inverse.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrixBase.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseVector.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/TriangularSolver.h
-- ../../extern/Eigen3/Eigen/src/Sparse/AmbiVector.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseDenseProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseBlock.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseTriangularView.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
-- ../../extern/Eigen3/Eigen/src/Sparse/CoreIterators.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrix.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseAssign.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseSparseProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseDot.h
-- ../../extern/Eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseRedux.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseFuzzy.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseView.h
-- ../../extern/Eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseUtil.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseTranspose.h
-- ../../extern/Eigen3/Eigen/src/Sparse/SparseProduct.h
-- ../../extern/Eigen3/Eigen/src/Sparse/CompressedStorage.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
-- ../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
-- ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
-- ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h
-- ../../extern/Eigen3/Eigen/src/Core/Swap.h
-- ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
-- ../../extern/Eigen3/Eigen/src/Core/DenseBase.h
-- ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
-- ../../extern/Eigen3/Eigen/src/Core/ProductBase.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/Stride.h
-- ../../extern/Eigen3/Eigen/src/Core/Matrix.h
-- ../../extern/Eigen3/Eigen/src/Core/Visitor.h
-- ../../extern/Eigen3/Eigen/src/Core/Array.h
-- ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h
-- ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/EigenBase.h
-- ../../extern/Eigen3/Eigen/src/Core/Random.h
-- ../../extern/Eigen3/Eigen/src/Core/Redux.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
-- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/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/BooleanRedux.h
-- ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
-- ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Memory.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Meta.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Constants.h
-- ../../extern/Eigen3/Eigen/src/Core/util/Macros.h
-- ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
-- ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
-- ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
-- ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h
-- ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h
-- ../../extern/Eigen3/Eigen/src/Core/Transpositions.h
-- ../../extern/Eigen3/Eigen/src/Core/Select.h
-- ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
-- ../../extern/Eigen3/Eigen/src/Core/Dot.h
-- ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
-- ../../extern/Eigen3/Eigen/src/Core/Product.h
-- ../../extern/Eigen3/Eigen/src/Core/Transpose.h
-- ../../extern/Eigen3/Eigen/src/Core/Block.h
-- ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
-- ../../extern/Eigen3/Eigen/src/Core/MapBase.h
-- ../../extern/Eigen3/Eigen/src/Core/NoAlias.h
-- ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
-- ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
-- ../../extern/Eigen3/Eigen/src/Core/IO.h
-- ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/Reverse.h
-- ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h
-- ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h
-- ../../extern/Eigen3/Eigen/src/Core/StableNorm.h
-- ../../extern/Eigen3/Eigen/src/Core/NumTraits.h
-- ../../extern/Eigen3/Eigen/src/Core/Map.h
-- ../../extern/Eigen3/Eigen/src/Core/Functors.h
-- ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h
-- ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
-- ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h
-- ../../extern/Eigen3/Eigen/src/Core/NestByValue.h
-- ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
-- ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h
-- ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h
-- ../../extern/Eigen3/Eigen/src/Core/Diagonal.h
-- ../../extern/Eigen3/Eigen/src/Core/Replicate.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
-- ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
-- ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
-- ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
-- ../../extern/Eigen3/Eigen/src/Core/Assign.h
-- ../../extern/Eigen3/Eigen/src/Core/Flagged.h
-- ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h
-- ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
-+ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/BlockMethods.h
-+ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
-+ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
-+ /usr/include/eigen3/Eigen/src/misc/Kernel.h
-+ /usr/include/eigen3/Eigen/src/misc/Image.h
-+ /usr/include/eigen3/Eigen/src/misc/Solve.h
-+ /usr/include/eigen3/Eigen/src/QR/HouseholderQR.h
-+ /usr/include/eigen3/Eigen/src/QR/ColPivHouseholderQR.h
-+ /usr/include/eigen3/Eigen/src/QR/FullPivHouseholderQR.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/details.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/StdList.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/StdDeque.h
-+ /usr/include/eigen3/Eigen/src/StlSupport/StdVector.h
-+ /usr/include/eigen3/Eigen/src/SVD/UpperBidiagonalization.h
-+ /usr/include/eigen3/Eigen/src/SVD/JacobiSVD.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/RealSchur.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
-+ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenSolver.h
-+ /usr/include/eigen3/Eigen/src/Jacobi/Jacobi.h
-+ /usr/include/eigen3/Eigen/src/Householder/Householder.h
-+ /usr/include/eigen3/Eigen/src/Householder/BlockHouseholder.h
-+ /usr/include/eigen3/Eigen/src/Householder/HouseholderSequence.h
-+ /usr/include/eigen3/Eigen/src/Geometry/RotationBase.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Rotation2D.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Homogeneous.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Hyperplane.h
-+ /usr/include/eigen3/Eigen/src/Geometry/EulerAngles.h
-+ /usr/include/eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
-+ /usr/include/eigen3/Eigen/src/Geometry/ParametrizedLine.h
-+ /usr/include/eigen3/Eigen/src/Geometry/OrthoMethods.h
-+ /usr/include/eigen3/Eigen/src/Geometry/AngleAxis.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Umeyama.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Scaling.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Translation.h
-+ /usr/include/eigen3/Eigen/src/Geometry/AlignedBox.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Transform.h
-+ /usr/include/eigen3/Eigen/src/Geometry/Quaternion.h
-+ /usr/include/eigen3/Eigen/src/LU/PartialPivLU.h
-+ /usr/include/eigen3/Eigen/src/LU/Determinant.h
-+ /usr/include/eigen3/Eigen/src/LU/arch/Inverse_SSE.h
-+ /usr/include/eigen3/Eigen/src/LU/FullPivLU.h
-+ /usr/include/eigen3/Eigen/src/LU/Inverse.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrixBase.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseVector.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/TriangularSolver.h
-+ /usr/include/eigen3/Eigen/src/Sparse/AmbiVector.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseDenseProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseBlock.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseTriangularView.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
-+ /usr/include/eigen3/Eigen/src/Sparse/CoreIterators.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrix.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseAssign.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseSparseProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseDot.h
-+ /usr/include/eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseRedux.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseFuzzy.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseView.h
-+ /usr/include/eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseUtil.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseTranspose.h
-+ /usr/include/eigen3/Eigen/src/Sparse/SparseProduct.h
-+ /usr/include/eigen3/Eigen/src/Sparse/CompressedStorage.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Cwise.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/QR.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Lazy.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Memory.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/SVD.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/VectorBlock.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Meta.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Macros.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/LeastSquares.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/LU.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Block.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/All.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/Minor.h
-+ /usr/include/eigen3/Eigen/src/Eigen2Support/MathFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/SelfAdjointView.h
-+ /usr/include/eigen3/Eigen/src/Core/MatrixBase.h
-+ /usr/include/eigen3/Eigen/src/Core/Swap.h
-+ /usr/include/eigen3/Eigen/src/Core/DenseCoeffsBase.h
-+ /usr/include/eigen3/Eigen/src/Core/DenseBase.h
-+ /usr/include/eigen3/Eigen/src/Core/GlobalFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/ProductBase.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseBinaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/Stride.h
-+ /usr/include/eigen3/Eigen/src/Core/Matrix.h
-+ /usr/include/eigen3/Eigen/src/Core/Visitor.h
-+ /usr/include/eigen3/Eigen/src/Core/Array.h
-+ /usr/include/eigen3/Eigen/src/Core/ReturnByValue.h
-+ /usr/include/eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/EigenBase.h
-+ /usr/include/eigen3/Eigen/src/Core/Random.h
-+ /usr/include/eigen3/Eigen/src/Core/Redux.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/Default/Settings.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/NEON/Complex.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/Complex.h
-+ /usr/include/eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/BooleanRedux.h
-+ /usr/include/eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
-+ /usr/include/eigen3/Eigen/src/Core/util/BlasUtil.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Memory.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Meta.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Constants.h
-+ /usr/include/eigen3/Eigen/src/Core/util/Macros.h
-+ /usr/include/eigen3/Eigen/src/Core/util/ForwardDeclarations.h
-+ /usr/include/eigen3/Eigen/src/Core/util/StaticAssert.h
-+ /usr/include/eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
-+ /usr/include/eigen3/Eigen/src/Core/util/XprHelper.h
-+ /usr/include/eigen3/Eigen/src/Core/VectorBlock.h
-+ /usr/include/eigen3/Eigen/src/Core/Transpositions.h
-+ /usr/include/eigen3/Eigen/src/Core/Select.h
-+ /usr/include/eigen3/Eigen/src/Core/BandMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryView.h
-+ /usr/include/eigen3/Eigen/src/Core/Dot.h
-+ /usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h
-+ /usr/include/eigen3/Eigen/src/Core/Product.h
-+ /usr/include/eigen3/Eigen/src/Core/Transpose.h
-+ /usr/include/eigen3/Eigen/src/Core/Block.h
-+ /usr/include/eigen3/Eigen/src/Core/ArrayWrapper.h
-+ /usr/include/eigen3/Eigen/src/Core/MapBase.h
-+ /usr/include/eigen3/Eigen/src/Core/NoAlias.h
-+ /usr/include/eigen3/Eigen/src/Core/ForceAlignedAccess.h
-+ /usr/include/eigen3/Eigen/src/Core/PlainObjectBase.h
-+ /usr/include/eigen3/Eigen/src/Core/IO.h
-+ /usr/include/eigen3/Eigen/src/Core/DiagonalMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/Reverse.h
-+ /usr/include/eigen3/Eigen/src/Core/Fuzzy.h
-+ /usr/include/eigen3/Eigen/src/Core/DenseStorage.h
-+ /usr/include/eigen3/Eigen/src/Core/StableNorm.h
-+ /usr/include/eigen3/Eigen/src/Core/NumTraits.h
-+ /usr/include/eigen3/Eigen/src/Core/Map.h
-+ /usr/include/eigen3/Eigen/src/Core/Functors.h
-+ /usr/include/eigen3/Eigen/src/Core/PermutationMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/ArrayBase.h
-+ /usr/include/eigen3/Eigen/src/Core/CwiseNullaryOp.h
-+ /usr/include/eigen3/Eigen/src/Core/SolveTriangular.h
-+ /usr/include/eigen3/Eigen/src/Core/NestByValue.h
-+ /usr/include/eigen3/Eigen/src/Core/DiagonalProduct.h
-+ /usr/include/eigen3/Eigen/src/Core/CommaInitializer.h
-+ /usr/include/eigen3/Eigen/src/Core/MathFunctions.h
-+ /usr/include/eigen3/Eigen/src/Core/Diagonal.h
-+ /usr/include/eigen3/Eigen/src/Core/Replicate.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointProduct.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/Parallelizer.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
-+ /usr/include/eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
-+ /usr/include/eigen3/Eigen/src/Core/TriangularMatrix.h
-+ /usr/include/eigen3/Eigen/src/Core/VectorwiseOp.h
-+ /usr/include/eigen3/Eigen/src/Core/Assign.h
-+ /usr/include/eigen3/Eigen/src/Core/Flagged.h
-+ /usr/include/eigen3/Eigen/src/Cholesky/LDLT.h
-+ /usr/include/eigen3/Eigen/src/Cholesky/LLT.h
- )
-
- if(WIN32)
-diff -Npur blender-2.63a.orig/intern/itasc/SConscript blender-2.63a/intern/itasc/SConscript
---- blender-2.63a.orig/intern/itasc/SConscript 2012-06-05 09:57:12.722807027 +0200
-+++ blender-2.63a/intern/itasc/SConscript 2012-06-05 10:04:06.107799720 +0200
-@@ -5,7 +5,7 @@ sources = env.Glob('*.cpp')
- sources += env.Glob('kdl/*.cpp')
- sources += env.Glob('kdl/utilities/*.cpp')
-
--incs = '. ../../extern/Eigen3'
-+incs = '. /usr/include/eigen3'
-
- defs = []
-
-diff -Npur blender-2.63a.orig/source/blender/ikplugin/CMakeLists.txt blender-2.63a/source/blender/ikplugin/CMakeLists.txt
---- blender-2.63a.orig/source/blender/ikplugin/CMakeLists.txt 2012-06-05 09:57:12.622807031 +0200
-+++ blender-2.63a/source/blender/ikplugin/CMakeLists.txt 2012-06-05 10:04:58.026798803 +0200
-@@ -49,9 +49,11 @@ set(SRC
- if(WITH_IK_ITASC)
- add_definitions(-DWITH_IK_ITASC)
- list(APPEND INC
-- ../../../extern/Eigen3
- ../../../intern/itasc
- )
-+ list(APPEND INC_SYS
-+ /usr/include/eigen3
-+ )
- list(APPEND SRC
- intern/itasc_plugin.cpp
- )
-diff -Npur blender-2.63a.orig/source/blender/ikplugin/SConscript blender-2.63a/source/blender/ikplugin/SConscript
---- blender-2.63a.orig/source/blender/ikplugin/SConscript 2012-06-05 09:57:12.622807031 +0200
-+++ blender-2.63a/source/blender/ikplugin/SConscript 2012-06-05 10:05:53.177797828 +0200
-@@ -4,7 +4,7 @@ defs = []
- sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
-
- incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib'
--incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3'
-+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen3'
-
- defs.append('WITH_IK_ITASC')
-
-diff -Npur blender-2.63a.orig/source/gameengine/Converter/CMakeLists.txt blender-2.63a/source/gameengine/Converter/CMakeLists.txt
---- blender-2.63a.orig/source/gameengine/Converter/CMakeLists.txt 2012-06-05 09:57:12.160807039 +0200
-+++ blender-2.63a/source/gameengine/Converter/CMakeLists.txt 2012-06-05 10:06:39.015797020 +0200
-@@ -50,7 +50,6 @@ set(INC
- ../../blender/makesrna
- ../../blender/windowmanager
- ../../../extern/bullet2/src
-- ../../../extern/Eigen3
- ../../../intern/container
- ../../../intern/guardedalloc
- ../../../intern/moto/include
-@@ -60,7 +59,7 @@ set(INC
-
- set(INC_SYS
- ${PTHREADS_INCLUDE_DIRS}
--
-+ /usr/include/eigen3
- )
-
- set(SRC
-diff -Npur blender-2.63a.orig/source/gameengine/Converter/SConscript blender-2.63a/source/gameengine/Converter/SConscript
---- blender-2.63a.orig/source/gameengine/Converter/SConscript 2012-06-05 09:57:12.160807039 +0200
-+++ blender-2.63a/source/gameengine/Converter/SConscript 2012-06-05 10:07:10.286796462 +0200
-@@ -21,7 +21,7 @@ incs += ' #source/blender/windowmanager'
- incs += ' #source/blender/makesrna'
- incs += ' #source/blender/ikplugin'
- incs += ' #extern/recastnavigation/Detour/Include'
--incs += ' #extern/Eigen3'
-+incs += ' /usr/include/eigen3'
-
- incs += ' ' + env['BF_BULLET_INC']
-
diff --git a/media-gfx/blender/files/blender-2.63a-insecure.desktop b/media-gfx/blender/files/blender-2.63a-insecure.desktop
deleted file mode 100644
index c4ccb30..0000000
--- a/media-gfx/blender/files/blender-2.63a-insecure.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Name=Blender-2.63a (reduced security)
-GenericName=3D modeller (reduced security)
-GenericName[es]=modelador 3D (reduced security)
-GenericName[de]=3D Modellierer (weniger Sicherheit)
-GenericName[fr]=modeleur 3D (reduced security)
-GenericName[ru]=Редактор 3D-моделей (reduced security)
-Comment=3D modeling, animation, rendering and post-production
-Comment[es]=modelado 3D, animación, renderizado y post-producción
-Comment[de]=3D-Modellierung, Animation, Rendering und Nachbearbeitung
-Comment[fr]=modeleur 3D, animation, rendu et post-production
-Exec=blender-2.63a --enable-autoexec %f
-Icon=blender-2.63a
-Terminal=false
-Type=Application
-Categories=Graphics;3DGraphics;
-MimeType=application/x-blender;
diff --git a/media-gfx/blender/files/blender-desktop.patch b/media-gfx/blender/files/blender-desktop.patch
deleted file mode 100644
index 515a79d..0000000
--- a/media-gfx/blender/files/blender-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- release/freedesktop/blender.desktop 2010-09-12 00:05:51.000000000 -0700
-+++ release/freedesktop/blender.desktop 2010-09-12 00:07:32.000000000 -0700
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Blender
-+Name=Blender-2.6
- GenericName=3D modeller
- GenericName[es]=modelador 3D
- GenericName[de]=3D Modellierer
-@@ -7,8 +7,8 @@
- GenericName[ru]=Редактор 3D-моделей
- Comment=3D modeling, animation, rendering and post-production
- Comment[es]=modelado 3D, animación, renderizado y post-producción
--Exec=blender
--Icon=blender
-+Exec=blender-2.60
-+Icon=blender-2.60
- Terminal=false
- Type=Application
- Categories=Graphics;3DGraphics;
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
deleted file mode 100644
index 7a6955e..0000000
--- a/media-gfx/blender/metadata.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-
- <herd>graphics</herd>
-
- <maintainer>
- <email>lu_zero@gentoo.org</email>
- <name>Luca Barbato</name>
- </maintainer>
-
- <maintainer>
- <email>anthoine.bourgeois@gmail.com</email>
- <name>Anthoine Bourgeois</name>
- <description>aluco's overlay maintainer</description>
- </maintainer>
-
- <longdescription>
- Blender, the open source software for 3D modeling, animation,
- rendering, post-production, interactive creation and playback.
- Available for Windows, Linux, Irix, Sun Solaris, FreeBSD or Mac OS X.
- </longdescription>
- <use>
- <flag name="3dmouse">
- Support 3D mouse (<pkg>media-libs/libspnav</pkg>).
- </flag>
- <flag name="game-engine">
- Adds Game Engine support to Blender (>=2.5* ebuilds).
- </flag>
- <flag name="contrib">
- Install contrib scripts.
- </flag>
- <flag name="openexr">
- Support for the OpenEXR graphics file format.
- </flag>
- <flag name="collada">
- Add support for Collada interchange format.
- </flag>
- <flag name="cycles">
- Enables Cycles render engine.
- </flag>
- <flag name="dds">
- Adds DDS textures support to Blender.
- </flag>
- <flag name="player">
- Build the Blender Player.
- </flag>
- <flag name="elbeem">
- Adds surface fluid simulation to Blender using El'Beem library.
- </flag>
- <flag name="apidoc">
- Build GameEngine/Python/C API documentation directly from the source
- code using tools epydoc (dev-python/epydoc) and doxygen
- (app-doc/doxygen).
- </flag>
- <flag name="tweak-mode">
- This flag allows you to model without confirming each translation,
- in particular it lets you grab with left mouse button (LMB) and not
- having to confirm by another click. Blender 'Tweak Mode' is similar
- to the 'Tweak Mode' of the Wings modeller (<pkg>media-gfx/wings</pkg>).
- </flag>
- <flag name="redcode">
- This flag add support for RED CODE camera digital format (5K HD
- images *.r3d) - EXPERIMENTAL.
- </flag>
- <flag name='oceansim'>
- Build with ocean simulation.
- </flag>
- <flag name='pax_kernel'>Enable building under a PaX enabled kernel
- (<pkg>sys-apps/paxctl</pkg>)
- </flag>
- </use>
-</pkgmetadata>