diff options
author | Julian Ospald <hasufell@gentoo.org> | 2014-12-16 15:58:43 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2014-12-16 15:58:43 +0000 |
commit | b228a5dffa354f9addd39e5eb5a6e709559f8a1d (patch) | |
tree | 902c3b8582c5a80fc37f899dfb9a03cac627f659 /media-gfx/blender | |
parent | Fix changelog (diff) | |
download | historical-b228a5dffa354f9addd39e5eb5a6e709559f8a1d.tar.gz historical-b228a5dffa354f9addd39e5eb5a6e709559f8a1d.tar.bz2 historical-b228a5dffa354f9addd39e5eb5a6e709559f8a1d.zip |
rm old
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020
Diffstat (limited to 'media-gfx/blender')
-rw-r--r-- | media-gfx/blender/ChangeLog | 12 | ||||
-rw-r--r-- | media-gfx/blender/Manifest | 42 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.69-r1.ebuild | 263 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.71-r2.ebuild | 276 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.72-r1.ebuild | 274 | ||||
-rw-r--r-- | media-gfx/blender/files/02-blender-2.68-unbundle-colamd.patch | 61 | ||||
-rw-r--r-- | media-gfx/blender/files/04-blender-2.68-unbundle-glog.patch | 105 | ||||
-rw-r--r-- | media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch | 111 | ||||
-rw-r--r-- | media-gfx/blender/files/05-blender-2.68-unbundle-eigen3.patch | 334 | ||||
-rw-r--r-- | media-gfx/blender/files/07-blender-2.68-sse2.patch | 35 | ||||
-rw-r--r-- | media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch | 62 |
11 files changed, 26 insertions, 1549 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index 10abebd71282..c6c88f321cc9 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-gfx/blender # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.276 2014/10/27 20:53:30 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.277 2014/12/16 15:58:39 hasufell Exp $ + + 16 Dec 2014; Julian Ospald <hasufell@gentoo.org> -blender-2.69-r1.ebuild, + -blender-2.71-r2.ebuild, -blender-2.72-r1.ebuild, + -files/07-blender-2.68-sse2.patch, + -files/02-blender-2.68-unbundle-colamd.patch, + -files/05-blender-2.68-unbundle-eigen3.patch, + -files/04-blender-2.68-unbundle-glog.patch, + -files/04-blender-2.71-r2-unbundle-glog.patch, + -files/09-blender-2.72-unbundle-minilzo.patch: + rm old *blender-2.72b (27 Oct 2014) diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 359725c643f1..f6d0cfe3f243 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -2,45 +2,33 @@ Hash: SHA256 AUX 01-blender-2.68-doxyfile.patch 732 SHA256 d485da5bdf1f123d945b8f945a84ead947ff123b4126a626bb394256ea07cbec SHA512 5191a25127e24d3ac7b18f6cd0b247e76a3fdeec46640f5d1ecba118fa35abbdaf19642c718e85149a304e9dc2093465b54b96e343f125163d091f045ab09db7 WHIRLPOOL 5cfdb697bf18aa50488495d017feda2e071332996a72e1a3c347291034c7230ad63c89e38670a86df633d3dc8359962e8888e4f0f1a2fa0b478acdb33a8f4d64 -AUX 02-blender-2.68-unbundle-colamd.patch 1863 SHA256 721620f8451f585a35725570cba5ed61106710f4dac9de6aaa81b3d5335db41f SHA512 3163b07fa184b0cff975e53adeb27f10fe01121fc55daf059d4967e5415ef590cfcab087bf862cdb8313319ea99d53252d04f72163cb092087b4e54bb778b623 WHIRLPOOL 450218063c8f999e7d16af9d01adf18847446bdf7a07166e4f8866413de6fd7c46dddcf0156c876bcd84c8775eaabfd0aaa6852f580d54bccf3c747f49afb7c4 AUX 02-blender-2.71-unbundle-colamd.patch 1592 SHA256 d86234ea75cec01786685e985a6f0f13b60f4fbd296e906d96a24beed9118598 SHA512 f3656380c588ebc54f327e1997e0b0f6fc9b2f3ac6fa2fcae6eb2c217503d5567fb88972d8eec4dd3a1f0dea0aee9171914d0436042d672c097e8777d31ff76b WHIRLPOOL bb8ece004007b4b25a7c772c0a2e8ccdb6ed21e5ab265446465feecd99c803434e0093e9e580893fdda34489cb4c404a56a46f09684a5f3854f23dd2f856eede -AUX 04-blender-2.68-unbundle-glog.patch 3352 SHA256 52e5d89d59e1610e84ab6e319e55c073f80b67bd94ed7bc2af1f57074a32405a SHA512 407d313cbc1bc21cab50e3344b4647a03c396ceeccca5e844c14b8c0110638bfe064a283ea886e81ee628278ce89f54aa6c8ce6d0b5b35cc987b42a311d806a1 WHIRLPOOL 28d3c152e6997d4f15f9bf94f1a3758f36928e44c10a8f7eb4fb2e524cf0af2dad9aae93eecc93d72f2c732e39e6f3b135071f391eeadfaa0fc121cd73ae30f9 -AUX 04-blender-2.71-r2-unbundle-glog.patch 3424 SHA256 d054213d5ac14a6a8a5adaa02fa7644de7208af24f4c897ab18cd8d22f9fdb1d SHA512 2ec4cc532bc0c90af59a20df872d187f570415d9e125c300a17cdf555c02ed6ee448ca7d8f54a532472cf94ed003fc0f9198f4cc1d811505bace53123f385922 WHIRLPOOL f31ce542c00a793b8d3e6247d480db2292dba6cc5f117beaf0759942d54e0384e59a690b0333dcb774a8053d98c0f20c6274098322a43106545a0fbf03ca965f AUX 04-blender-2.71-unbundle-glog.patch 1650 SHA256 bec78cb9ec67f5a5fafdca06bf796c8e9a4f531fbf3ab78ebe124df317e9c8eb SHA512 92eaca756e5b0c6c1c958cb58a47b9aeb87dcd6494ec7a7fee83ec06887e3fa323886e44cfcc968e40f4cb99a352cdba56ea25c6c5a051b769101e0ae3eecdc1 WHIRLPOOL 54e65ec7e42d4e847caec17312b53e349fb40d2bac0a924ca7cedddaf8773acb30750a1f903b4c9c142c04d2ba76095a16ab50043ab1112b198bca5e048ef202 -AUX 05-blender-2.68-unbundle-eigen3.patch 16058 SHA256 546bfc4ec8a4397a860ca15414698d90748f3b62fef106fab1bf842ab7515c52 SHA512 8b5d7a974c88611586fcc065b31a43756a23ca56aeb7204cae90d99657ff0f6505973c110def6fb80405db5607f2a6b5eef8eb26fb9065eef610437b5535282a WHIRLPOOL ad749aed40df519f8886a30bfbdf8cb243941d79da265226bc5f4e1c17b0cc180d3fcb1a41fc3ea982d31660b0a87fa0ab40c0e0a4defc996133eb90692b755e AUX 05-blender-2.72-unbundle-eigen3.patch 16059 SHA256 3117049d46c9422ccae069e050793fe9265cc120a1f319938bc73c704e0621e1 SHA512 549ab60c03252a789ac8fa1b01e53f3a633e081ecc647990ec360af5b8cb4875b4d107638f5b567631c6fa5e9d40c23116ea691bf9ce27565cf74db54f6214ae WHIRLPOOL b1fe13820dd573240443e2ab56ad7c93fd91b1e92ac975e1a7da406c25934de7f412587b939458f807a0aca3e26e4297c4c58ff22ee0dc35953925807f269fc4 AUX 06-blender-2.68-fix-install-rules.patch 740 SHA256 93ae6cc8cfbb2ce856adf7a0dbf5966843630edaa4d7828de42d1bb5ba76058d SHA512 dd21cb3aa8bf965631132d39ad8a43c15d0c32faeaee00e8b8a970108fba0ab43b2402e3637dcd0b3430b7023ac9203b0395bbd2dc2dd9eb80d8c1d994d89e4f WHIRLPOOL 7c86d7637fdbf1d4c1f631b6a47c7e02399a00976189acaf9fc041765419cd2ffaaaab0d6fb05f4ba67024d14cfc778f3620f9d6cbf89e81b16a467e45beac75 -AUX 07-blender-2.68-sse2.patch 1622 SHA256 fb5aeba243e4da34a1d5ce3893f6db4b84ee90a1bedd6e89dbbfc8c4d7f47418 SHA512 06bc29c771e1d86813add2225523074b7d5ff622b0db4b2e2653917903abd2039b367d6c9e5a3a17021fc85a59585d518a2d05fb9872b7306589ddfbb9897780 WHIRLPOOL 5a0f0e652596687962720b1e6835fce1d0510c771efa7976deffeb3e35df3d5fbcf1400ad02ca4162cb4deccd46d101272e8514c0f6446f1f87afdf2a07eac24 AUX 07-blender-2.70-sse2.patch 1421 SHA256 b20d9aba206543e765e147e7740aff48ef968b90620d9d4b902cb6c23b9ba28f SHA512 9888110efaab16ec15438ad463c3ffa0bb4f64c23bb162254abe0ddb4acd42935a5fd1fdbf186b1cf1dad042044f8777b5f58c446423894788c655187bfe3cca WHIRLPOOL c3990dac70078a13ba005da5b649b9b72bdf04313551f2e41d639efc6a666006e1af54f11bb8c82608956df03547297303bf7a8a6e8cd03364d994910bde60c7 AUX 08-blender-2.71-gflags.patch 2223 SHA256 295c043088854b62da158ff6a445a8cdb0114a2298de32f4221cb483e9eb407a SHA512 efec5beed218ba0ab3c76ec65c47408631753567c31076cb8431923d5ff0df59c91ab1d2d42007944d307c6aba35746c2435eb9318b65fd69b4c2ed280570f87 WHIRLPOOL 4b5721af9fe9bebe4df1f324eb53f25459f454ce28f46b9af703c47660969b9a6dc1e73d544dbdad2738aad3a9ae53cf8d805bf20af8763f8a59b051302435c2 -AUX 09-blender-2.72-unbundle-minilzo.patch 1329 SHA256 e2a758c48be589e2fa9f28b040e1c0b24fc1f21f50270857a9382a2b6c279ebe SHA512 cdf8ce8a26f150fa9903201cfc2f7187f812b20feea117bcfe19914a72570229a489870a232bfbcffff548fde9e256e6e76064242d25e222a21736adcdf8fd99 WHIRLPOOL d31f6d2f05209de6a485c6473c147131c063d3997a1dbb800824aabd1d81085154383d5ec099819792fb012f0c82ad43c875fa2d5848aad7a6b8837856a49b74 AUX 09-blender-2.72b-unbundle-minilzo.patch 1170 SHA256 17464deac2c2536b671e16415fc3d37077727f558f8b36e1405ccf179f3c563b SHA512 d062628c837b1f4889bc9616b0814abc27c38cb1f7a77d9276846dccc12c148f22d4647d9aabb41ec342c7c52a4fad95c110869d9599c5204f803a5fb237eed2 WHIRLPOOL 69719041ebe17430fccc45875f08a64c34431c0f6f9e744d2b7d1a3b82c358a69ecbe5d8033eae63d112fcb60ffff108dc03a6b9dad7f0bbdd9c014046781dbc -DIST blender-2.69.tar.gz 41274518 SHA256 c94a7f5dec0d42683b96b2591c240ebcc2743d10b84fc53ca13374b5e654ce09 SHA512 f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142 WHIRLPOOL 30b5e8dd4e2a8ed3a0e9484656d9ac5b6c420076438aa0cdabf3d5d6b5d608bb90d5253c365b712899a9b7ea8965b815059e3e8c5a712c07c399f7848c14e8cb -DIST blender-2.71-r2.tar.gz 56881288 SHA256 1d7d5a67a8ce5d258534fc0d426c30dbff56995b5648deba98b21b446f6e5889 SHA512 0b481a9567a44a39851ef816769f3d8b2840eda7bf3aa63706d03135f03db27adccbb419a42528744b67b8643aaf2f8f5907e2368be34615be4e53b0d8c43939 WHIRLPOOL ba7f70e093caf3b43b53207bd7dbed1ab8d0c531cd63aa4dbcb302d952c9aaa628b21b143bc853f0fb61041087b6932303bf1228eea0fe49b4ffdcc073127846 -DIST blender-2.72.tar.gz 57506461 SHA256 17a90210180d6ffa189b3a0546a6b0103aeae3df49ecb5356cc05b5bb455d8b9 SHA512 94f9ad214ccf53e7bea8de327aec745b6c6d77dbb44d3c3ed9703543eb136152bfc54d17f60ce376dc1212f2f7045b07b6d976ccb5ddb9c3f84d684eaa7cb8a0 WHIRLPOOL 8f39c1d78c017968067a2648ef4be6decc914d92fd87f5ee131a4a1a37503e3ed920fa2e73e3d03daeb61ef006cb91b8b99b4e591d29af37af25b3cb70afa21c DIST blender-2.72b.tar.gz 52018242 SHA256 4436c704afa28e2e5e7b28b2c06981806ddedab70565d40972e422c00644bf47 SHA512 9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124 WHIRLPOOL 3687255bc9f4195b25b66a75630676ee15e67cf10a058dca11b3472617b54aae2bebb1810cc16e19c58ca1c09b1ea8b70f72e30c05632ab0bae8910925a37a54 -EBUILD blender-2.69-r1.ebuild 7376 SHA256 c6eacb81387cd56abf9dd4357338fb592e8b6778bdd114a7b789755f0bc7eaa9 SHA512 729cbcb4963c960315e64b28cc1d011867d6e9792bb423c4fad20330abbabb718792470a2e3235757a05c641d32b6f9f3736ce9535b5db71f54798adb9e2d6a6 WHIRLPOOL a4b5a9540d0f7f72bbc8e8102c80cd6577eba522d933ed3997ee607226eeed8477503e6376811433705395ddeecbd5132c828ee3960f106f85c47967696db809 -EBUILD blender-2.71-r2.ebuild 7815 SHA256 b5e8c4c1ba8c18042877f0f6ddfd86ffd63453b893786b99904022349abb1691 SHA512 0effbd4390b41c4fa36db7c42fc41dc7457024c512ac43369a56bd28ec7299918a798cadb17d1ed34234f79c7d8108bc7ee01e6686575dfaddf7ef8ca898a18c WHIRLPOOL 1d70b7727e32b8d4a9e2e173e6f1ea6988936cf653f3d2b6fc716a009159605b4ef79a0fc727a121e407085bfea14dbec7edd79887340fa4513ff9e150197da9 -EBUILD blender-2.72-r1.ebuild 7769 SHA256 71e14ff8fd27c0e4c2ab30761acea0b2b7cc37fc62b2ff2f64b7adb3fef72116 SHA512 94cd31432186646e41335276ec30cdf097eb5523342a6fab7dc32946916c34c94b2f0d5855ca0bc001ff1e2c4af2942d03033b2080281b8149b35b2a39c197ab WHIRLPOOL fdc68872f033ef6436406c0c208b0a8ce20e1b9161d4df05714fde8e809015c1bee79b4e7d9a55ca50c3f77344bf3fda549cabb407c8542aa2809d46640250a2 EBUILD blender-2.72b.ebuild 7768 SHA256 ebba26ae8f6c85cd8655e0ec5e599580ce543db927f4f48fcdc191e69aadae50 SHA512 cbb4c0ecd9159c86edbfc11d50d6025ed7c110c95aeae23b2ee88585b1180cb54292d227c975c6337bcbd096e23d92bae1cae83cf6b319e7d8c034728c712328 WHIRLPOOL aaf7b8db578518cebddda9e7d90bb81f5970be8b5a8981ceee6bd42b9f06a075b3f1cf7ceb7632f2eceea4c8689b9d63985100c72c767cb54523f1676e92a084 -MISC ChangeLog 49532 SHA256 2e4e3fd16e8f9a9a5c8ce816cd54156255e62859c848097eb679f53c43c2bece SHA512 12267083171682739ff07d8da7bce6c6d6b3065de6132319160ca096f5137afff1222a21a5b69dc1adf0f2aefef9db3c15c1a1c3b814eddcc24654fd63ba067f WHIRLPOOL 9eae4c7d413c5f3198fdf77080944ac39aea043a93d3b2f837dfe46529a028d1c00c90539bf82aa5eafd7dca32d35506656708801109b4f761c3a077e7f6a856 +MISC ChangeLog 49947 SHA256 c836889f468474d8dbf0b18e3256fb8b473b6e258e2b833aaa7a8a181351dd9c SHA512 7e09c80f03bf5999419471717f12ece3052d7d95f6904cd72bcda086978411ce1719884392b16e4b933520e5887e0103f81da51ef65f49549f7d6ddc020a8384 WHIRLPOOL 6f2b48be4d4413750a49cb10622c84fac63f32f1df72cbe483e78ee5e5b071152105148ff8af893edc7acc3950d579ac7a3aabbbc32dcc34d4bfa8b84bc49548 MISC metadata.xml 1943 SHA256 442b4b8f917e536321467f5b4408d6530fc8030db5d3efa532a007aaa81defb0 SHA512 8a18cfb1afc6e465c3e10698470794971c2b967f914332421817bbe1c6dc92372d61139803d3b5b7bdd5fd6a80c53b0eb2d0554ae8b41e5d5e4b75de30969a0c WHIRLPOOL 9ab06cf2763dbedc21723e36e9afa72710d8299f602c63152345ea3c67ea3398d8e7ac0c6b4b1c37a2767cb6598b5a76d793ab300483a052c00e6789f08f648c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUTrDNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJUkFaxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy -MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgDC4QAKc1hWnWoJ1KNWd8xm9HJCMF -Be6yDdMKM+nKRDldgeqejD+pWOOQF0iUp1ODynPHrUmJyPU0d3OUcDL48LSobM8n -SEUICySGRKgSm7xEbQfr7TVMTvyR1DR9eYqu2kMbknqLEBLIAFLLiex8NnU9zviz -0eeRfWBZCW2T8I1Z8AU+rCWDfbMdY3KdnocRrPdGleFJi2da/ghDrx1v9kCTYX5e -jfYnxqAlF3aKkyBagPbe7sAnjuLFfg74H/M1uBwLdIScuuO9XfqRhB5Qu1mf0+Gv -WoQob1KWLThWBnGy83tnDHqDoU6767tc1Clap+LBceux0fCg49kvsYcJNo6bHrYk -Rks0C4V9odxNIICB9x2plMEJpe7/T/FOJ2anPOHdiohRYE57GrFpAtaD+QVm2pQh -RW9eynHe6p1PNJD2MXfq0dHqBE3jXxtjX13ydGZVYYtZPN15gh3IJWJdQ7zf4kn+ -QngnmfQTWx8hqL1SYkxtDoPrKZcbYl7xcuHgFocbDt7DSp1V7BSw16wgpQDJwW0M -ZzWCXgDxN+8oRU/9T/apVm7rKyoKEUMjQ88wYSm0TWhkSS2/TAIoHKB45JkvsqiR -JM3L2WdAU+dqZ2TEJc7zJuzM2+Yt+mWjh/Igr+yBJazkuVLgW0XiWvwqE/ObkYMv -kBcAMxe+ZftTT3ipdwzk -=6eni +MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgEgcQAK8mVf59zGVr2XP3ebtYdZWs +jhwV0Koi1w987XuBAF0UUdAhBTvJEAovJg70/YVi6Vc3i5N9cPKBB/X7mSpMpEAE +XpWmSXkLsS7rGoJ9McTIV2PXV8mI1zukd9qifBV/WofkhjCBh4kNCXRoppr0Xf+S +iBGO2jPJme70HK6Rp1Ai3LxdC6fB7llgetQP9wBGEuu+4w3FvJEI3qAkEoe+uJA+ +ZO690AqfI1tfqZKvbuRM84y0Z2s+MqO19DIydxfRaVWC5nCYnzGgLgbXS4xj3KTf +qwXLSIU7rs8BNJcv0LHOMWULY2KwlTy2Z4ygD6rjPg3AbGO+DUJ/cmS79BPitwzq +kWgPQVrzJJsUghTEgPBkUIijMGzBNMlu+zPcYlTNM8OsG93YU3zlMFzdwKBGHoWB +lXS+b8rg0GWWoFu+ZHdsssGyOuGOCRttNdD+5qo4upJsslTOW+zBGgXjvo3LG2GZ +zlocKINcQySSIEyFzkJf3xxaCehO6eWvGJKQejHUpuJ3CkWwHbfROa3Q6k0sqM/k +VRD8cf3nI1IXuJ0e1feV3svo9XHqr4zis6ZonEmCM9SQ2+tpev0TFCU7Ftj0a3oM +Z8PdwaSJY+qplOHjI4twwal/NS9XwA/TIYsk2F4eG7ALeTmXS++6cuEvdNr+IMow +LLZ9lQrnSDVUXGnV3tof +=tHA0 -----END PGP SIGNATURE----- diff --git a/media-gfx/blender/blender-2.69-r1.ebuild b/media-gfx/blender/blender-2.69-r1.ebuild deleted file mode 100644 index 4f5d44349993..000000000000 --- a/media-gfx/blender/blender-2.69-r1.ebuild +++ /dev/null @@ -1,263 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.69-r1.ebuild,v 1.2 2014/05/15 17:08:04 ulm Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_3 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ffmpeg ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-cpp/gflags - dev-cpp/glog[gflags] - dev-python/numpy[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( media-libs/opencolorio ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - media-video/ffmpeg:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( media-libs/openjpeg:0 ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ - "${FILESDIR}"/02-${PN}-2.68-unbundle-colamd.patch \ - "${FILESDIR}"/04-${PN}-2.68-unbundle-glog.patch \ - "${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/07-${PN}-2.68-sse2.patch - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/libmv/third_party/{ldl,glog,gflags} \ - || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - for i in "${S}"/release/datafiles/locale/* ; do - mylang=${i##*/} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripting." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/blender-2.71-r2.ebuild b/media-gfx/blender/blender-2.71-r2.ebuild deleted file mode 100644 index c35a94bc0348..000000000000 --- a/media-gfx/blender/blender-2.71-r2.ebuild +++ /dev/null @@ -1,276 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.71-r2.ebuild,v 1.1 2014/09/27 14:55:43 hasufell Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_4 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz -> ${PF}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ffmpeg ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/gflags-2.1.1-r1 - >=dev-cpp/glog-0.3.3-r1[gflags] - >=dev-libs/lzo-2.08:2 - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( <=media-libs/opencolorio-1.0.9 ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - >=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( media-libs/openjpeg:0 ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openimageio? ( media-libs/openimageio ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/${PN}-v${PV} - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ - "${FILESDIR}"/02-${PN}-2.68-unbundle-colamd.patch \ - "${FILESDIR}"/04-${PN}-2.71-r2-unbundle-glog.patch \ - "${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/07-${PN}-2.70-sse2.patch \ - "${FILESDIR}"/08-${PN}-2.71-gflags.patch \ - "${FILESDIR}"/09-${PN}-2.72-unbundle-minilzo.patch - - epatch_user - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/lzo \ - extern/libmv/third_party/{glog,gflags} \ - || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - cd "${S}"/release/datafiles/locale/po - for i in *.po ; do - mylang=${i%.po} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openimageio OPENIMAGEIO) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with opennl OPENNL) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripting." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/blender-2.72-r1.ebuild b/media-gfx/blender/blender-2.72-r1.ebuild deleted file mode 100644 index 7a6c17179480..000000000000 --- a/media-gfx/blender/blender-2.72-r1.ebuild +++ /dev/null @@ -1,274 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.72-r1.ebuild,v 1.1 2014/09/27 15:03:38 hasufell Exp $ - -# TODO: -# bundled-deps: bullet is modified -# multiple python abi? - -EAPI=5 -PYTHON_COMPAT=( python3_4 ) -#PATCHSET="1" - -inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -case ${PV} in - *_p*) - SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; - *) - SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;; -esac - -if [[ -n ${PATCHSET} ]]; then - SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" -fi - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine ) - redcode? ( jpeg2k ffmpeg ) - cycles? ( boost openexr tiff ) - nls? ( boost ) - game-engine? ( boost )" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/gflags-2.1.1-r1 - >=dev-cpp/glog-0.3.3-r1[gflags] - >=dev-libs/lzo-2.08:2 - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - >=media-libs/freetype-2.0 - media-libs/glew - media-libs/libpng:0 - media-libs/libsamplerate - sci-libs/colamd - sci-libs/ldl - sys-libs/zlib - virtual/glu - virtual/jpeg - virtual/libintl - virtual/opengl - x11-libs/libXi - x11-libs/libX11 - boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) - collada? ( media-libs/opencollada ) - colorio? ( <=media-libs/opencolorio-1.0.9 ) - cycles? ( - media-libs/openimageio - ) - ffmpeg? ( - || ( - >=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?] - >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] - ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( media-sound/jack-audio-connection-kit ) - jpeg2k? ( media-libs/openjpeg:0 ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( >=media-libs/openal-1.6.372 ) - openimageio? ( media-libs/openimageio ) - openexr? ( media-libs/openexr ) - sdl? ( media-libs/libsdl[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 )" -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.1.3:3 - doc? ( - app-doc/doxygen[-nodot(-),dot(+)] - dev-python/sphinx - ) - nls? ( sys-devel/gettext )" - -pkg_pretend() { - if use openmp && ! tc-has-openmp; then - eerror "You are using gcc built without 'openmp' USE." - eerror "Switch CXX to an OpenMP capable compiler." - die "Need openmp" - fi - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ - "${FILESDIR}"/02-${PN}-2.71-unbundle-colamd.patch \ - "${FILESDIR}"/04-${PN}-2.71-unbundle-glog.patch \ - "${FILESDIR}"/05-${PN}-2.72-unbundle-eigen3.patch \ - "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/07-${PN}-2.70-sse2.patch \ - "${FILESDIR}"/08-${PN}-2.71-gflags.patch \ - "${FILESDIR}"/09-${PN}-2.72-unbundle-minilzo.patch - - epatch_user - - # remove some bundled deps - rm -r \ - extern/Eigen3 \ - extern/libopenjpeg \ - extern/glew \ - extern/colamd \ - extern/lzo \ - extern/libmv/third_party/{glog,gflags} \ - || die - - # we don't want static glew, but it's scattered across - # thousand files - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - sed -i \ - -e '/-DGLEW_STATIC/d' \ - $(find . -type f -name "CMakeLists.txt") || die - - ewarn "$(echo "Remaining bundled dependencies:"; - ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" - - # linguas cleanup - local i - if ! use nls; then - rm -r "${S}"/release/datafiles/locale || die - else - if [[ -n "${LINGUAS+x}" ]] ; then - cd "${S}"/release/datafiles/locale/po - for i in *.po ; do - mylang=${i%.po} - has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } - done - fi - fi -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - - # WITH_PYTHON_SECURITY - # WITH_PYTHON_SAFETY - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr - -DWITH_INSTALL_PORTABLE=OFF - $(cmake-utils_use_with boost BOOST) - $(cmake-utils_use_with cycles CYCLES) - $(cmake-utils_use_with collada OPENCOLLADA) - $(cmake-utils_use_with dds IMAGE_DDS) - $(cmake-utils_use_with elbeem MOD_FLUID) - $(cmake-utils_use_with ffmpeg CODEC_FFMPEG) - $(cmake-utils_use_with fftw FFTW3) - $(cmake-utils_use_with fftw MOD_OCEANSIM) - $(cmake-utils_use_with game-engine GAMEENGINE) - $(cmake-utils_use_with nls INTERNATIONAL) - $(cmake-utils_use_with jack JACK) - $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) - $(cmake-utils_use_with openimageio OPENIMAGEIO) - $(cmake-utils_use_with openal OPENAL) - $(cmake-utils_use_with openexr IMAGE_OPENEXR) - $(cmake-utils_use_with openmp OPENMP) - $(cmake-utils_use_with opennl OPENNL) - $(cmake-utils_use_with player PLAYER) - $(cmake-utils_use_with redcode IMAGE_REDCODE) - $(cmake-utils_use_with sdl SDL) - $(cmake-utils_use_with sndfile CODEC_SNDFILE) - $(cmake-utils_use_with sse RAYOPTIMIZATION) - $(cmake-utils_use_with sse2 SSE2) - $(cmake-utils_use_with bullet BULLET) - $(cmake-utils_use_with tiff IMAGE_TIFF) - $(cmake-utils_use_with colorio OPENCOLORIO) - $(cmake-utils_use_with ndof INPUT_NDOF) - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_BULLET=OFF - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { :; } - -src_install() { - local i - - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "API/python" - dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* - - docinto "API/blender" - dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* - fi - - # fucked up cmake will relink binary for no reason - emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast - - # fix doc installdir - dohtml "${CMAKE_USE_DIR}"/release/text/readme.html - rm -rf "${ED%/}"/usr/share/doc/blender - - python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py - python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripting." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/media-gfx/blender/files/02-blender-2.68-unbundle-colamd.patch b/media-gfx/blender/files/02-blender-2.68-unbundle-colamd.patch deleted file mode 100644 index 7103a57cb568..000000000000 --- a/media-gfx/blender/files/02-blender-2.68-unbundle-colamd.patch +++ /dev/null @@ -1,61 +0,0 @@ -commit f6af85bef74ae6d1df1e811db7274829e50f10a9 -Author: hasufell <hasufell@gentoo.org> -Date: Fri Jul 19 18:37:21 2013 +0200 - - unbundle colamd - -diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt -index f6de873..2b40c22 100644 ---- a/extern/CMakeLists.txt -+++ b/extern/CMakeLists.txt -@@ -26,7 +26,6 @@ - # Otherwise we get warnings here that we cant fix in external projects - remove_strict_flags() - --add_subdirectory(colamd) - add_subdirectory(rangetree) - add_subdirectory(wcwidth) - add_subdirectory(libmv) -diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt -index d91319d..bc3baee 100644 ---- a/source/blenderplayer/CMakeLists.txt -+++ b/source/blenderplayer/CMakeLists.txt -@@ -170,8 +170,6 @@ endif() - list(APPEND BLENDER_SORTED_LIBS extern_ceres) - endif() - -- list(APPEND BLENDER_SORTED_LIBS extern_colamd) -- - if(WITH_MOD_BOOLEAN) - list(APPEND BLENDER_SORTED_LIBS bf_intern_bsp) - list(APPEND BLENDER_SORTED_LIBS bf_intern_moto) -@@ -214,7 +212,7 @@ endif() - list(SORT REM_MSG) - message(STATUS "Player Skipping: (${REM_MSG})") - endif() -- target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS}) -+ target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS} colamd) - - unset(SEARCHLIB) - unset(SORTLIB) -diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt -index 8ff4ec4..c84d944 100644 ---- a/source/creator/CMakeLists.txt -+++ b/source/creator/CMakeLists.txt -@@ -919,7 +919,6 @@ endif() - bf_intern_smoke - extern_minilzo - extern_lzma -- extern_colamd - ge_logic_ketsji - extern_recastnavigation - ge_logic -@@ -1033,7 +1032,7 @@ endif() - list(SORT REM_MSG) - message(STATUS "Blender Skipping: (${REM_MSG})") - endif() -- target_link_libraries(blender ${BLENDER_SORTED_LIBS}) -+ target_link_libraries(blender ${BLENDER_SORTED_LIBS} colamd) - - unset(SEARCHLIB) - unset(SORTLIB) diff --git a/media-gfx/blender/files/04-blender-2.68-unbundle-glog.patch b/media-gfx/blender/files/04-blender-2.68-unbundle-glog.patch deleted file mode 100644 index 2ac54394db1c..000000000000 --- a/media-gfx/blender/files/04-blender-2.68-unbundle-glog.patch +++ /dev/null @@ -1,105 +0,0 @@ -commit 26e853d31931a8bb08695aa98ae53b263236d407 -Author: hasufell <hasufell@gentoo.org> -Date: Fri Jul 19 18:40:23 2013 +0200 - - unbundle glog/gflags - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1a7830..a30831c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,6 +106,14 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE) - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE) - - #----------------------------------------------------------------------------- -+# Check for some modules -+if(UNIX) -+ find_package(PkgConfig) -+ pkg_check_modules(_PC_GFLAGS libgflags) -+ pkg_check_modules(_PC_GLOG libglog) -+endif() -+ -+#----------------------------------------------------------------------------- - # Set default config options - - get_blender_version() -diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt -index 2c9a219..7061e04 100644 ---- a/extern/libmv/CMakeLists.txt -+++ b/extern/libmv/CMakeLists.txt -@@ -88,9 +88,6 @@ if(WITH_LIBMV) - third_party/fast/fast_9.c - third_party/fast/fast.c - third_party/fast/nonmax.c -- third_party/gflags/gflags.cc -- third_party/gflags/gflags_completions.cc -- third_party/gflags/gflags_reporting.cc - - libmv/base/id_generator.h - libmv/base/scoped_ptr.h -@@ -141,12 +138,6 @@ if(WITH_LIBMV) - libmv/tracking/trklt_region_tracker.h - - third_party/fast/fast.h -- third_party/gflags/config.h -- third_party/gflags/gflags/gflags_completions.h -- third_party/gflags/gflags/gflags_declare.h -- third_party/gflags/gflags/gflags.h -- third_party/gflags/mutex.h -- third_party/gflags/util.h - third_party/msinttypes/inttypes.h - third_party/msinttypes/stdint.h - ) -@@ -187,42 +178,6 @@ if(WITH_LIBMV) - third_party/msinttypes - ) - endif() -- else() -- list(APPEND SRC -- third_party/glog/src/demangle.cc -- third_party/glog/src/logging.cc -- third_party/glog/src/raw_logging.cc -- third_party/glog/src/signalhandler.cc -- third_party/glog/src/symbolize.cc -- third_party/glog/src/utilities.cc -- third_party/glog/src/vlog_is_on.cc -- -- third_party/glog/src/base/commandlineflags.h -- third_party/glog/src/base/googleinit.h -- third_party/glog/src/base/mutex.h -- third_party/glog/src/config_freebsd.h -- third_party/glog/src/config.h -- third_party/glog/src/config_hurd.h -- third_party/glog/src/config_linux.h -- third_party/glog/src/config_mac.h -- third_party/glog/src/demangle.h -- third_party/glog/src/glog/logging.h -- third_party/glog/src/glog/log_severity.h -- third_party/glog/src/glog/raw_logging.h -- third_party/glog/src/glog/vlog_is_on.h -- third_party/glog/src/stacktrace_generic-inl.h -- third_party/glog/src/stacktrace.h -- third_party/glog/src/stacktrace_libunwind-inl.h -- third_party/glog/src/stacktrace_powerpc-inl.h -- third_party/glog/src/stacktrace_x86_64-inl.h -- third_party/glog/src/stacktrace_x86-inl.h -- third_party/glog/src/symbolize.h -- third_party/glog/src/utilities.h -- ) -- -- list(APPEND INC -- third_party/glog/src -- ) - endif() - - add_definitions( -@@ -234,7 +189,9 @@ else() - ) - endif() - -+include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS}) - blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}") -+target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES}) - - if(WITH_LIBMV) - add_subdirectory(third_party) diff --git a/media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch b/media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch deleted file mode 100644 index b64f60ba0b94..000000000000 --- a/media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch +++ /dev/null @@ -1,111 +0,0 @@ -commit 26e853d31931a8bb08695aa98ae53b263236d407 -Author: hasufell <hasufell@gentoo.org> -Date: Fri Jul 19 18:40:23 2013 +0200 - - unbundle glog/gflags - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1a7830..a30831c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,6 +106,14 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE) - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE) - - #----------------------------------------------------------------------------- -+# Check for some modules -+if(UNIX) -+ find_package(PkgConfig) -+ pkg_check_modules(_PC_GFLAGS libgflags) -+ pkg_check_modules(_PC_GLOG libglog) -+endif() -+ -+#----------------------------------------------------------------------------- - # Set default config options - - get_blender_version() -diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt -index 2c9a219..7061e04 100644 ---- a/extern/libmv/CMakeLists.txt -+++ b/extern/libmv/CMakeLists.txt -@@ -44,8 +44,6 @@ - ) - - list(APPEND INC -- third_party/gflags -- third_party/glog/src - third_party/ceres/include - ../../intern/guardedalloc - ) -@@ -92,10 +90,6 @@ - libmv/tracking/track_region.cc - libmv/tracking/trklt_region_tracker.cc - -- third_party/gflags/gflags.cc -- third_party/gflags/gflags_completions.cc -- third_party/gflags/gflags_reporting.cc -- - libmv-util.h - libmv/base/aligned_malloc.h - libmv/base/id_generator.h -@@ -149,12 +143,6 @@ - libmv/tracking/track_region.h - libmv/tracking/trklt_region_tracker.h - -- third_party/gflags/config.h -- third_party/gflags/gflags/gflags_completions.h -- third_party/gflags/gflags/gflags_declare.h -- third_party/gflags/gflags/gflags.h -- third_party/gflags/mutex.h -- third_party/gflags/util.h - third_party/msinttypes/inttypes.h - third_party/msinttypes/stdint.h - ) -@@ -195,38 +183,6 @@ - third_party/msinttypes - ) - endif() -- else() -- list(APPEND SRC -- third_party/glog/src/demangle.cc -- third_party/glog/src/logging.cc -- third_party/glog/src/raw_logging.cc -- third_party/glog/src/signalhandler.cc -- third_party/glog/src/symbolize.cc -- third_party/glog/src/utilities.cc -- third_party/glog/src/vlog_is_on.cc -- -- third_party/glog/src/base/commandlineflags.h -- third_party/glog/src/base/googleinit.h -- third_party/glog/src/base/mutex.h -- third_party/glog/src/config_freebsd.h -- third_party/glog/src/config.h -- third_party/glog/src/config_hurd.h -- third_party/glog/src/config_linux.h -- third_party/glog/src/config_mac.h -- third_party/glog/src/demangle.h -- third_party/glog/src/glog/logging.h -- third_party/glog/src/glog/log_severity.h -- third_party/glog/src/glog/raw_logging.h -- third_party/glog/src/glog/vlog_is_on.h -- third_party/glog/src/stacktrace_generic-inl.h -- third_party/glog/src/stacktrace.h -- third_party/glog/src/stacktrace_libunwind-inl.h -- third_party/glog/src/stacktrace_powerpc-inl.h -- third_party/glog/src/stacktrace_x86_64-inl.h -- third_party/glog/src/stacktrace_x86-inl.h -- third_party/glog/src/symbolize.h -- third_party/glog/src/utilities.h -- ) - endif() - else() - list(APPEND SRC -@@ -234,7 +190,9 @@ - ) - endif() - -+include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS}) - blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}") -+target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES}) - - if(WITH_LIBMV) - add_subdirectory(third_party) diff --git a/media-gfx/blender/files/05-blender-2.68-unbundle-eigen3.patch b/media-gfx/blender/files/05-blender-2.68-unbundle-eigen3.patch deleted file mode 100644 index 0382bbc051ff..000000000000 --- a/media-gfx/blender/files/05-blender-2.68-unbundle-eigen3.patch +++ /dev/null @@ -1,334 +0,0 @@ -commit 03b41be3de15b4810e55ff1988d27d28eb358df0 -Author: hasufell <hasufell@gentoo.org> -Date: Fri Jul 19 18:47:43 2013 +0200 - - unbundle Eigen3 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a30831c..78bb3c6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -109,6 +109,7 @@ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE) - # Check for some modules - if(UNIX) - find_package(PkgConfig) -+ pkg_check_modules(_PC_EIGEN3 eigen3) - pkg_check_modules(_PC_GFLAGS libgflags) - pkg_check_modules(_PC_GLOG libglog) - endif() -diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt -index 7061e04..b8ab180 100644 ---- a/extern/libmv/CMakeLists.txt -+++ b/extern/libmv/CMakeLists.txt -@@ -44,7 +44,7 @@ if(WITH_LIBMV) - ) - - set(INC_SYS -- ../Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ${PNG_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIRS} - ) -diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt -index 0645883..d79fe9e 100644 ---- a/extern/libmv/third_party/ceres/CMakeLists.txt -+++ b/extern/libmv/third_party/ceres/CMakeLists.txt -@@ -35,7 +35,7 @@ set(INC - ) - - set(INC_SYS -- ../../../Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ) - - set(SRC -diff --git a/intern/dualcon/CMakeLists.txt b/intern/dualcon/CMakeLists.txt -index da5e10f..a4aae1b 100644 ---- a/intern/dualcon/CMakeLists.txt -+++ b/intern/dualcon/CMakeLists.txt -@@ -22,7 +22,7 @@ set(INC - ) - - set(INC_SYS -- ../../extern/Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ) - - set(SRC -diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt -index bc3ea0c..f8cbc23 100644 ---- a/intern/itasc/CMakeLists.txt -+++ b/intern/itasc/CMakeLists.txt -@@ -28,7 +28,7 @@ - ) - - set(INC_SYS -- ../../extern/Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ) - - set(SRC -@@ -119,237 +119,6 @@ - kdl/frameacc.inl - kdl/frames.inl - kdl/framevel.inl -- -- # until we have another user... -- ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h -- ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h -- ../../extern/Eigen3/Eigen/src/Cholesky/LLT_MKL.h -- ../../extern/Eigen3/Eigen/src/CholmodSupport/CholmodSupport.h -- ../../extern/Eigen3/Eigen/src/Core/Array.h -- ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h -- ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h -- ../../extern/Eigen3/Eigen/src/Core/Assign.h -- ../../extern/Eigen3/Eigen/src/Core/Assign_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/Block.h -- ../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h -- ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h -- ../../extern/Eigen3/Eigen/src/Core/DenseBase.h -- ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h -- ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h -- ../../extern/Eigen3/Eigen/src/Core/Diagonal.h -- ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h -- ../../extern/Eigen3/Eigen/src/Core/Dot.h -- ../../extern/Eigen3/Eigen/src/Core/EigenBase.h -- ../../extern/Eigen3/Eigen/src/Core/Flagged.h -- ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h -- ../../extern/Eigen3/Eigen/src/Core/Functors.h -- ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h -- ../../extern/Eigen3/Eigen/src/Core/GeneralProduct.h -- ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h -- ../../extern/Eigen3/Eigen/src/Core/IO.h -- ../../extern/Eigen3/Eigen/src/Core/Map.h -- ../../extern/Eigen3/Eigen/src/Core/MapBase.h -- ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h -- ../../extern/Eigen3/Eigen/src/Core/Matrix.h -- ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h -- ../../extern/Eigen3/Eigen/src/Core/NestByValue.h -- ../../extern/Eigen3/Eigen/src/Core/NoAlias.h -- ../../extern/Eigen3/Eigen/src/Core/NumTraits.h -- ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h -- ../../extern/Eigen3/Eigen/src/Core/Product.h -- ../../extern/Eigen3/Eigen/src/Core/ProductBase.h -- ../../extern/Eigen3/Eigen/src/Core/Random.h -- ../../extern/Eigen3/Eigen/src/Core/Redux.h -- ../../extern/Eigen3/Eigen/src/Core/Replicate.h -- ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h -- ../../extern/Eigen3/Eigen/src/Core/Reverse.h -- ../../extern/Eigen3/Eigen/src/Core/Select.h -- ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h -- ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h -- ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h -- ../../extern/Eigen3/Eigen/src/Core/StableNorm.h -- ../../extern/Eigen3/Eigen/src/Core/Stride.h -- ../../extern/Eigen3/Eigen/src/Core/Swap.h -- ../../extern/Eigen3/Eigen/src/Core/Transpose.h -- ../../extern/Eigen3/Eigen/src/Core/Transpositions.h -- ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h -- ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h -- ../../extern/Eigen3/Eigen/src/Core/Visitor.h -- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h -- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h -- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h -- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h -- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h -- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h -- ../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h -- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h -- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h -- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h -- ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h -- ../../extern/Eigen3/Eigen/src/Core/util/Constants.h -- ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h -- ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h -- ../../extern/Eigen3/Eigen/src/Core/util/Macros.h -- ../../extern/Eigen3/Eigen/src/Core/util/Memory.h -- ../../extern/Eigen3/Eigen/src/Core/util/Meta.h -- ../../extern/Eigen3/Eigen/src/Core/util/MKL_support.h -- ../../extern/Eigen3/Eigen/src/Core/util/NonMPL2.h -- ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h -- ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h -- ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h -- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur_MKL.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur_MKL.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h -- ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h -- ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h -- ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h -- ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h -- ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h -- ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h -- ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h -- ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h -- ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h -- ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h -- ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h -- ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h -- ../../extern/Eigen3/Eigen/src/Geometry/Transform.h -- ../../extern/Eigen3/Eigen/src/Geometry/Translation.h -- ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h -- ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h -- ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h -- ../../extern/Eigen3/Eigen/src/Householder/Householder.h -- ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h -- ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h -- ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h -- ../../extern/Eigen3/Eigen/src/LU/Determinant.h -- ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h -- ../../extern/Eigen3/Eigen/src/LU/Inverse.h -- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h -- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU_MKL.h -- ../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h -- ../../extern/Eigen3/Eigen/src/misc/blas.h -- ../../extern/Eigen3/Eigen/src/misc/Image.h -- ../../extern/Eigen3/Eigen/src/misc/Kernel.h -- ../../extern/Eigen3/Eigen/src/misc/Solve.h -- ../../extern/Eigen3/Eigen/src/misc/SparseSolve.h -- ../../extern/Eigen3/Eigen/src/OrderingMethods/Amd.h -- ../../extern/Eigen3/Eigen/src/PardisoSupport/PardisoSupport.h -- ../../extern/Eigen3/Eigen/src/PaStiXSupport/PaStiXSupport.h -- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h -- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h -- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h -- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h -- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR_MKL.h -- ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h -- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h -- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR_MKL.h -- ../../extern/Eigen3/Eigen/src/SparseCholesky/SimplicialCholesky.h -- ../../extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h -- ../../extern/Eigen3/Eigen/src/SparseCore/CompressedStorage.h -- ../../extern/Eigen3/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h -- ../../extern/Eigen3/Eigen/src/SparseCore/CoreIterators.h -- ../../extern/Eigen3/Eigen/src/SparseCore/MappedSparseMatrix.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseAssign.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseBlock.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseBinaryOp.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseUnaryOp.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseDenseProduct.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseDiagonalProduct.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseDot.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseFuzzy.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrix.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrixBase.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparsePermutation.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseProduct.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseRedux.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseSparseProductWithPruning.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseTranspose.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseTriangularView.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseUtil.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseVector.h -- ../../extern/Eigen3/Eigen/src/SparseCore/SparseView.h -- ../../extern/Eigen3/Eigen/src/SparseCore/TriangularSolver.h -- ../../extern/Eigen3/Eigen/src/StlSupport/details.h -- ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h -- ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h -- ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h -- ../../extern/Eigen3/Eigen/src/SuperLUSupport/SuperLUSupport.h -- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h -- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD_MKL.h -- ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h -- ../../extern/Eigen3/Eigen/src/UmfPackSupport/UmfPackSupport.h - ) - - -diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt -index 0a0e0e6..45fe6c9 100644 ---- a/source/blender/ikplugin/CMakeLists.txt -+++ b/source/blender/ikplugin/CMakeLists.txt -@@ -59,7 +59,7 @@ if(WITH_IK_ITASC) - ../../../intern/itasc - ) - list(APPEND INC_SYS -- ../../../extern/Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ) - list(APPEND SRC - intern/itasc_plugin.cpp -diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt -index 084a85c..7cdfa01 100644 ---- a/source/gameengine/Converter/CMakeLists.txt -+++ b/source/gameengine/Converter/CMakeLists.txt -@@ -57,7 +57,7 @@ set(INC - set(INC_SYS - ../../../intern/moto/include - ../../../extern/recastnavigation/Detour/Include -- ../../../extern/Eigen3 -+ ${_PC_EIGEN3_INCLUDE_DIRS} - ${PTHREADS_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIR} - ) diff --git a/media-gfx/blender/files/07-blender-2.68-sse2.patch b/media-gfx/blender/files/07-blender-2.68-sse2.patch deleted file mode 100644 index 18b12db700d0..000000000000 --- a/media-gfx/blender/files/07-blender-2.68-sse2.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 0e0b27a589680e10e38a26575ad4dba8f3af2ec6 -Author: hasufell <hasufell@gentoo.org> -Date: Fri Jul 19 18:50:19 2013 +0200 - - add option to explicitly control sse2 optimization - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 78bb3c6..d5f4576 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -86,6 +86,7 @@ cmake_policy(SET CMP0014 NEW) - #----------------------------------------------------------------------------- - # Load some macros. - include(build_files/cmake/macros.cmake) -+include(CMakeDependentOption) - - - #----------------------------------------------------------------------------- -@@ -255,6 +256,7 @@ option(WITH_FREESTYLE "Enable Freestyle (advanced edges rendering)" ON) - # Misc - option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON) - option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON) -+cmake_dependent_option(WITH_SSE2 "SSE2 optimizations" ON WITH_RAYOPTIMIZATION OFF) - if(UNIX AND NOT APPLE) - option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON) - option(WITH_STATIC_LIBS "Try to link with static libraries, as much as possible, to make blender more portable across distributions" OFF) -@@ -1833,7 +1835,7 @@ if(WITH_RAYOPTIMIZATION) - set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}") - add_definitions(-D__SSE__ -D__MMX__) - endif() -- if(SUPPORT_SSE2_BUILD) -+ if(WITH_SSE2 AND SUPPORT_SSE2_BUILD) - set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}") - add_definitions(-D__SSE2__) - if(NOT SUPPORT_SSE_BUILD) # dont double up diff --git a/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch b/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch deleted file mode 100644 index e3ebc31532c7..000000000000 --- a/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Sat Sep 27 13:35:35 UTC 2014 -Subject: unbundle vulnerable minilzo version - ---- source/blender/blenkernel/intern/pointcache.c -+++ source/blender/blenkernel/intern/pointcache.c -@@ -84,11 +84,14 @@ - #endif - - #ifdef WITH_LZO --#include "minilzo.h" --#else -+#include <lzo/lzo1x.h> -+ -+#define LZO_HEAP_ALLOC(var,size) \ -+ lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ] -+#endif -+ - /* used for non-lzo cases */ - #define LZO_OUT_LEN(size) ((size) + (size) / 16 + 64 + 3) --#endif - - #ifdef WITH_LZMA - #include "LzmaLib.h" ---- extern/CMakeLists.txt -+++ extern/CMakeLists.txt -@@ -62,10 +62,6 @@ - add_subdirectory(libredcode) - endif() - --if(WITH_LZO) -- add_subdirectory(lzo) --endif() -- - if(WITH_LZMA) - add_subdirectory(lzma) - endif() ---- source/blender/blenkernel/CMakeLists.txt -+++ source/blender/blenkernel/CMakeLists.txt -@@ -397,9 +397,6 @@ - endif() - - if(WITH_LZO) -- list(APPEND INC_SYS -- ../../../extern/lzo/minilzo -- ) - add_definitions(-DWITH_LZO) - endif() - ---- build_files/cmake/macros.cmake -+++ build_files/cmake/macros.cmake -@@ -304,6 +304,10 @@ - endif() - endif() - -+ if(WITH_LZO) -+ target_link_libraries(${target} liblzo2.so) -+ endif() -+ - if(WITH_SYSTEM_GLEW) - target_link_libraries(${target} ${GLEW_LIBRARY}) - endif() |