summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2014-03-20 16:56:45 +0000
committerJulian Ospald <hasufell@gentoo.org>2014-03-20 16:56:45 +0000
commit6e2e4cee43402536fab93fc6e346a58e7ea4b7f5 (patch)
tree81ee3f7ac8637ffc202cd9d1cfc6a300e97bbe37 /media-gfx
parentSecurity bump (bug #505072) (diff)
downloadhistorical-6e2e4cee43402536fab93fc6e346a58e7ea4b7f5.tar.gz
historical-6e2e4cee43402536fab93fc6e346a58e7ea4b7f5.tar.bz2
historical-6e2e4cee43402536fab93fc6e346a58e7ea4b7f5.zip
version bump wrt #505138, fix redcode USE flag wrt #505178
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0xBDEED020
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/blender/ChangeLog9
-rw-r--r--media-gfx/blender/Manifest32
-rw-r--r--media-gfx/blender/blender-2.69.ebuild5
-rw-r--r--media-gfx/blender/blender-2.70.ebuild274
-rw-r--r--media-gfx/blender/files/04-blender-2.70-unbundle-glog.patch106
-rw-r--r--media-gfx/blender/files/07-blender-2.70-sse2.patch35
-rw-r--r--media-gfx/blender/metadata.xml4
7 files changed, 451 insertions, 14 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 6dd3b62a14c8..27eaf74980f7 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,13 @@
# 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.259 2014/01/22 01:11:12 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.260 2014/03/20 16:56:34 hasufell Exp $
+
+*blender-2.70 (20 Mar 2014)
+
+ 20 Mar 2014; Julian Ospald <hasufell@gentoo.org> blender-2.69.ebuild,
+ +blender-2.70.ebuild, +files/07-blender-2.70-sse2.patch,
+ +files/04-blender-2.70-unbundle-glog.patch, metadata.xml:
+ version bump wrt #505138, fix redcode USE flag wrt #505178
22 Jan 2014; Julian Ospald <hasufell@gentoo.org> blender-2.69.ebuild:
fix build with nls enabled
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 825eb1a608ba..86864c371708 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -9,12 +9,14 @@ AUX 03-blender-2.67b-remove-binreloc.patch 918 SHA256 f654304421f63bb89862c1688a
AUX 03-blender-2.68-remove-binreloc.patch 918 SHA256 53c26a698bf5026593ba144133a4f8e89d6cd9433dbd6c2f2f6e5638d2d3e27c SHA512 71c973b208f3177b83ae23f224e66c8b8f8db50e8f822a7ff050fe77513ee68f834654b0099b4639fb718be9ac5ad4a1abae8397042818066cb477759a1887a3 WHIRLPOOL 9179ecac1ef919d75ed0ee9463b7df7861926eb3dd3c486de6798fe0aa6ca29dc1240bcf24efc035d91c442d87143576b4ea5957519f2793a2e82ea9c37391cd
AUX 04-blender-2.67b-unbundle-glog.patch 3278 SHA256 2eaf6be80747200763fb3a5956cd0883c178ce17995f1563c747347bad096a8a SHA512 e2189b0e0841e5239195501ad39e59e571ad609e8ae81b87669c9c28165d4b92c5bc55080067756ab7655339b8e276d2d90a762c3c8ab4653ced0f4cc5d9246f WHIRLPOOL 154b807351b27b74933683777aadb5b4ddd1208ab6aff5317e5ba2feb4e504469b0c82a76c293fb90247f7a41987b8c4842bd9b724bd165077117cf186ffd845
AUX 04-blender-2.68-unbundle-glog.patch 3352 SHA256 52e5d89d59e1610e84ab6e319e55c073f80b67bd94ed7bc2af1f57074a32405a SHA512 407d313cbc1bc21cab50e3344b4647a03c396ceeccca5e844c14b8c0110638bfe064a283ea886e81ee628278ce89f54aa6c8ce6d0b5b35cc987b42a311d806a1 WHIRLPOOL 28d3c152e6997d4f15f9bf94f1a3758f36928e44c10a8f7eb4fb2e524cf0af2dad9aae93eecc93d72f2c732e39e6f3b135071f391eeadfaa0fc121cd73ae30f9
+AUX 04-blender-2.70-unbundle-glog.patch 3328 SHA256 a3ea77f91417bcc685346c957fa5979f4c65f9e602e81295acd26f7bf4fb002d SHA512 2bd17df822e19c2ceefabbe4f9beedfc4ea2bd2bf1b37efbecaeebc1e3b4114e4e953f5aea46bfe1264fbd365b602963bd7fa115f7ec0e4d222b15ba87131cef WHIRLPOOL 4aa12f49a711ba18ee03dd96771b1fdb52984a29164db10ae81500fb5092c6bc810e5a78fbeee9c90e48a417c3f26517a34cae904a9dbecbea2c0b0081bded0e
AUX 05-blender-2.67b-unbundle-eigen3.patch 30917 SHA256 587dbe4c263e564edfde0611b2fdde3527442d9c72759912e3efa484bc1ff152 SHA512 1dc845eb8ea6a1f5dae43c88eba9130501b80fa6f9948d294beb236fd9d77f0d6dc8efedcd2827e50721b19b302f97912aacd9d2b0d5904ef08ca21970279194 WHIRLPOOL 4978a467dd548104ee05db32c9093bd59249d2ef6fef7baead3949d9f4b0d8224c1342ed707a17affca1c31e0bf078d7b0aa352b2093e738242e8e3b7cce5ba1
AUX 05-blender-2.68-unbundle-eigen3.patch 16058 SHA256 546bfc4ec8a4397a860ca15414698d90748f3b62fef106fab1bf842ab7515c52 SHA512 8b5d7a974c88611586fcc065b31a43756a23ca56aeb7204cae90d99657ff0f6505973c110def6fb80405db5607f2a6b5eef8eb26fb9065eef610437b5535282a WHIRLPOOL ad749aed40df519f8886a30bfbdf8cb243941d79da265226bc5f4e1c17b0cc180d3fcb1a41fc3ea982d31660b0a87fa0ab40c0e0a4defc996133eb90692b755e
AUX 06-blender-2.67b-fix-install-rules.patch 740 SHA256 7b3b7a8b19c00b93ae2ebbc5f3cee294c20f8468b40fc5cd7fd686b81ba77adf SHA512 6ebd7ecb87a0137914145f38ded6bf4b7465391680329dc9a8a6fa00ae324cc81f49f485400c0edda6fe530b994231ae0eea6eb76cb8113b16f660d3da09f783 WHIRLPOOL 8ab814662605a492d0e7bbe0d899cfd35406ece17391a01951bb4d8ab285575126caf097772db174833c23ac5b3d4c67ed57ad54e9dcd2bc36e89fbeced23936
AUX 06-blender-2.68-fix-install-rules.patch 740 SHA256 93ae6cc8cfbb2ce856adf7a0dbf5966843630edaa4d7828de42d1bb5ba76058d SHA512 dd21cb3aa8bf965631132d39ad8a43c15d0c32faeaee00e8b8a970108fba0ab43b2402e3637dcd0b3430b7023ac9203b0395bbd2dc2dd9eb80d8c1d994d89e4f WHIRLPOOL 7c86d7637fdbf1d4c1f631b6a47c7e02399a00976189acaf9fc041765419cd2ffaaaab0d6fb05f4ba67024d14cfc778f3620f9d6cbf89e81b16a467e45beac75
AUX 07-blender-2.67b-sse2.patch 1622 SHA256 9c8f6a35413b7d6fee235668c78d072850637978905b70b4596b9e0b38f39f6d SHA512 2cb77391c5fc66d0211020db3820e51fff63fba8dce4852f39e18701f42aef0a44b0546042f309350e66d05bcd8b2119123b76a8e9fc1f557d7e9f415a0528b0 WHIRLPOOL a81f7d76091fd36be71b9586a99014929fbedcd65b6e66e4418ad6d0f45d99e4d65f9c7880be129f349642258488ccee9b18bf7d8a1cc5379e14c863d3aee4e8
AUX 07-blender-2.68-sse2.patch 1622 SHA256 fb5aeba243e4da34a1d5ce3893f6db4b84ee90a1bedd6e89dbbfc8c4d7f47418 SHA512 06bc29c771e1d86813add2225523074b7d5ff622b0db4b2e2653917903abd2039b367d6c9e5a3a17021fc85a59585d518a2d05fb9872b7306589ddfbb9897780 WHIRLPOOL 5a0f0e652596687962720b1e6835fce1d0510c771efa7976deffeb3e35df3d5fbcf1400ad02ca4162cb4deccd46d101272e8514c0f6446f1f87afdf2a07eac24
+AUX 07-blender-2.70-sse2.patch 1421 SHA256 b20d9aba206543e765e147e7740aff48ef968b90620d9d4b902cb6c23b9ba28f SHA512 9888110efaab16ec15438ad463c3ffa0bb4f64c23bb162254abe0ddb4acd42935a5fd1fdbf186b1cf1dad042044f8777b5f58c446423894788c655187bfe3cca WHIRLPOOL c3990dac70078a13ba005da5b649b9b72bdf04313551f2e41d639efc6a666006e1af54f11bb8c82608956df03547297303bf7a8a6e8cd03364d994910bde60c7
AUX blender-2.66-cmake.patch 381 SHA256 284c09ec1f0a0fc52123c704c7b89fb8795d83c6c25c7decef44e298343591a5 SHA512 d91f92d7817d2a317ea2328afd120b47d20e475937b8ba478db27f1ebdf6a661b567b15d1e9a1f5e89be0a775181ee8cc0867b261988428e524ea5c82269d5f4 WHIRLPOOL 0b844e49f813044303d94d60fc11b6a3fe8afdbfcc76ce3bd89d16a373fe03c3e6c2629be3599eafed8c7265f4b692f3e8f9bede9ca82e0d57ee5d654463dd6d
AUX blender-2.66-doxyfile.patch 473 SHA256 4d6f50eb13f71b1ca083d8d8bfc3467660be586fe7d973acc9ce9b8b9d9b3337 SHA512 72e8ce59e485a2bbc4c09b367001fdef9d2a01c7b296bf001c1b708b4984625c40a8dd4ddee2b2ba962aa8f666cc8ed50229803d460ae79a807353080d16d520 WHIRLPOOL 45e0178cc55cd1f2e2e685173abb195367f3e61f07c55e007b44b7e3c14ef53ed0b098335044bca58e16787b738a65b23b223515296c6439e3bdfa9698a35dbf
AUX blender-2.66-sse2.patch 1255 SHA256 0b7d7374226daec957755364414b4327efdde0430324b011d3e7d1483845e375 SHA512 e658ed4f0d913c599235acfd871f7d1aceda20f17d01e3753683527bf8a659a882d0c83a05f437f55abc9e252099485a1632f2b5842ce57940f747701b709e86 WHIRLPOOL b6cafc4bbdb35f6aeef9229a18db618272ad4a6a40154d9f9e3bc5ab23b51bcf11b5612a4bc0672f1cacb0d37e3a035fad54b0930ef6725f44af3953ba61f97e
@@ -26,22 +28,32 @@ DIST blender-2.67b.tar.gz 41368150 SHA256 7d6701d92ee7e3923771de10f610a3f8cca8b6
DIST blender-2.68.tar.gz 40073577 SHA256 3c102ebc42f989c8509c704c87dec465ba0ded81c9cfb15e44414ba2702ce21c SHA512 b7a8ce36714881d8dd809c3597695945cceddfc65ab2d20597a7d9c6327805d86edc4131cdc543d9267e120833781764a8a43a2dba06866fc4e62761f7c93ebf WHIRLPOOL d0bef7ad235d5738a243e7d48e6f451178fac9e400fc5d1dc82f1c400af737646a68d97087b8b56390a2488702d54cace7967abf49425e6c43fa7574ad4a72d5
DIST blender-2.68a.tar.gz 40042207 SHA256 13ed290b0db381523dd26689d29fd00b08bae01a9123533d75f0243733dd7b3a SHA512 ce93779c5cbadf361f08ad0f9d5370d52878f94edc0b113d73711b842169d0e000e1500ece8e534439d94c5983e6ff3f15ca4ccd74db5f21447274c475090019 WHIRLPOOL 0d391db77b2ad3035f98f63ae4f299a14fd0d584c7ec0e35936b267c0ea300fe76ced0f79864a85bdd5c3f67a7299b8da2f03381513f4a6c550ef06355ea80da
DIST blender-2.69.tar.gz 41274518 SHA256 c94a7f5dec0d42683b96b2591c240ebcc2743d10b84fc53ca13374b5e654ce09 SHA512 f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142 WHIRLPOOL 30b5e8dd4e2a8ed3a0e9484656d9ac5b6c420076438aa0cdabf3d5d6b5d608bb90d5253c365b712899a9b7ea8965b815059e3e8c5a712c07c399f7848c14e8cb
+DIST blender-2.70.tar.gz 55298021 SHA256 2695c3cab21721d1108c90e6e9cb4b279817f551904d5276793fb3adaef3e348 SHA512 5c5d3aa418b88eb55d25a28967edc9ff51b4f9337e15d662db8f4e23eea0772f31a256a7effdd1ffecf0636a300b821a7c53dd1c8b46311b572b412b758224af WHIRLPOOL 9174b325f0d027a56342699cde14fb3ef0883c3089573c9560af1d5adaa9e0815f1e449fd22da4fdc36efa5526094ed37b028e447fc987fba88f08944d75ceb5
EBUILD blender-2.64a.ebuild 7793 SHA256 c7d8f834d31e287958f44a6ae3ea94362b1f651f325df1256c4b1d97c2f48ed6 SHA512 ce6165280c3ac9b59e0e31c74791123fead93c9b91b169051328f4cdc9ad1e76ac6fea27ad8e8e3b7178639f3ef4cf8b8db79759e14afca302b39541ce18d472 WHIRLPOOL 55d443d2e0df5f7ec591cfae317d5b97f266b89a3146f67f4c73e8f7c9a1592908c833acaf9d285e6dacb59155a9637a7670c45b5167511d4c7530bae30ee010
EBUILD blender-2.66-r1.ebuild 7139 SHA256 011438751f8ea6f55307d337e4cedb0dd7e65a14751c9db21089a33c9b045dd1 SHA512 c61b745e5e90beb19fe9ee6dc0130cc8a599e444746cd1c8a1c131768ef5948b378cef7ff9ad19ffdab99a3383237c75bbeaa4b6934db01addaf13719c972e1c WHIRLPOOL bbcb267b210f0c2392c61fc93131ff9d938e3a0f8e1010d86cd8b50bf6cb5f8bd86773139df8fbad71279b03ede83d0bf890030663fc7f4b15c5307a3943fc82
EBUILD blender-2.67b-r1.ebuild 7427 SHA256 f0d03ad665b193486237fa70486daaa431e16f2c8935259ea2994ca151ae0b96 SHA512 91365c7dbeec837d901010aed569772f3916cba6de18f5630bfaa35d202e11b488bc11939397d12ed6a0314f41ed2cea463f41645ebacaa4f868500846552c01 WHIRLPOOL 98b932679c1a34a47f7ce5ab631aaa2187a8356d0c1eb5a578df89d16f5019dfb7e8a219a9fca6f3e1ed5b0ab30eabf4bce1bd3b42ce9414fd68e21784be119f
EBUILD blender-2.68.ebuild 7489 SHA256 4535f1ae0ecdcc199d51fd4eba72e6655ef70cb098faafd02e0376328188cdb9 SHA512 970f616bc9e992d2f7ed93c33de1057380eef69153a0ef191697821dd46f847d28cbf5cb28af7c20b031eb77db344bb9ee9045a063ab43bc23a295880f341aa7 WHIRLPOOL 6155ba3719813e942d70681657cf50bce884da9b93781512cb17be0fe92d0f7e6bc54a998e65ef7619018614180d4f9699628392943e00b41ec9f83dcddaed01
EBUILD blender-2.68a.ebuild 7532 SHA256 6358360c3b66795509d3dfb77d74e26eac000f619aa40652835e9e87dcd24ad5 SHA512 8a51cf77266377eae23eb8be418f68f7e1297a4318e77df2fa7a971431d5e087c79ef7b557154d432f999654b2603f076054ebcfa1fd6fe43a88531bf9075c7b WHIRLPOOL 48c97e6c9ca17939200c1183866533a867e57f8d9487b29f7bc335eb10b0bff5c4880007b9860fc8564cf5138efac47bbf940bc6af96de3b966e0b7b31f5bd8f
-EBUILD blender-2.69.ebuild 7536 SHA256 76f5df0d9b17bf822c4677b8940b11e3dbf3b88daaa1aa7bd256cfec1f07d21f SHA512 612d6da79daf01c292241408af32e2ae5b78429845a8dd76b01426e8f7ef95bb2608f669f224b5cffc6c8eb59b52293fe339897687ef77023aea09fac8a12f36 WHIRLPOOL a740745740fa5bc6c79d79bbcc76b3dff25462352f302b4d06c70fac15b1665c92171dda37f91bebcabdebb48833979c3118cd843e3be11f11189691708da6d6
-MISC ChangeLog 45432 SHA256 a103477e93b228557eea44034665e402be3a97f797255027849f0b8daca4a3ed SHA512 da10d101ea0902c9d52299e6d0cd3c8a2020b66ca0b4551366c1ee3cb3a0d860a55686a50a3cc2452695b6753142f582ee8f8181bead90a3497321cfb7a544c0 WHIRLPOOL a8cd459b3a0b8013b82dcb15c5cbd1551534d881aeca7c3e609041e4acfb4fe45ce7e1b378c7c46d14e1fe1c2b81cc7c0a75cb15211d3b0e24d9b177e7a9e07f
-MISC metadata.xml 2292 SHA256 9200af59c7e8551e71eef6e3d9b9653a74ef82f2e00a4c8fcfcbb1bee24dd888 SHA512 e0a20ec354899b299068aaee19ae64044bda5f1ea088485945b423cfdbe8a23bbb006b675d39604e9e5356bbc7185ce05fb1fdd42ecd04c1a052b874ac0de849 WHIRLPOOL 6bddc466a2cc1f7abef7bb6a4ee9aec23f53194053c9f0e08df5a7385e42fe88a49e0253ec4acc749a91ced9428b17ff49319e89dfde7001dde9ea5bd721bae5
+EBUILD blender-2.69.ebuild 7578 SHA256 464f47a278cc1a07ad078c7ff177a03a9dbfb6959e10603fb2dc8135a24c2a54 SHA512 f9d997af90eb430d6ab9558c63c797fc9750934908a6d0d51540c00584191dc8f5de4271ff51914b598cc7d40a80cd2ca33e3ac875ef6ec6996d9bd74773a175 WHIRLPOOL d36c49133d6a7867938f1b1d1a7aaa8b5e8598ec4ce910841485908d2dc1fe91fd71c53c4c187a761dcb0667e660e0cb9a897a0ff1ce9407a89d2c60db27d82b
+EBUILD blender-2.70.ebuild 7772 SHA256 17a4c2f16b1a96e3fe38fcd397beda94bf67922018769a370c8253eec32df6c2 SHA512 ccb51d409481078924c431359bf58fa06deaed336b7b5538c2910d20a82ac62d08151fbab3a14f49555834e395d1fbd4cf7e929978153a975fcb64cf98eeded6 WHIRLPOOL 6e5fce7efeafd28e05b427045077875335f69ef3b4e003e9b1f956979ad22dfaf3b14d46205270898e883f4c3fa9df6df856085e2a116478b2591130aca85ce7
+MISC ChangeLog 45714 SHA256 ee7d9f15982cd0c244dac47025f454a5fb9b32c835a622fca2f684eeacc0fac6 SHA512 bd259148da4537e5d0704060d1fbc9213484e0c701e63a9b63e90a8ea96bb897a6ec83074429f7cfabd49cc421f844b85552598856144f4c5d0b632838542705 WHIRLPOOL dead5a1a8e4062e50245567324faf995ffbc503e3300715a554aee8e2e97b9066a80ad57b019cc8d24f632991a56a69fbc1c9263b22a6e10b24b3f0bdcaf8518
+MISC metadata.xml 2420 SHA256 da8715c8e1b7319223b0e3b48a88ec7ce307efda73f98824fa2defb8b951c52b SHA512 720927dbf1abc75da95b9dacf20ca0553bd167341ef6fbc182c7fcb145d05702e2875ea7d43531140f82d0618e24ae68bae42d9a400ef73945a4d203c1ccbebc WHIRLPOOL 364cdd61304fa0645a6a0a0e293a89050e575a8d8d8f2e9d9862cb38073ab40d4c31f81fa8b27b4a84e20a0137dc8eedc2ac9e1a4e54b1a6f6432166d319601e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQEcBAEBCAAGBQJS3xq2AAoJEFpvPKfnPDWz5gQH/1s3F9SRikwiBodBCeMBrtqq
-RhLjem6Q711SbFq9x/Cy0y8Oi/vcpU+qWSxKFpEo3UUT4KwJWzLiXaHxNFZ4BfDx
-WOrGgIhb8807XQz2j9q9q385vkibSPmUMvIrQTaL5EobBrV1NQXhbXG0OzBuqJOn
-FGAkVkCU89oQpQTmNwfUZw7LphrkuDUfhaUZ4aVnQz7AmbePPD8HBdnabbwXfR24
-oUeatTWWri4cuaemGkQfb6eX/Z8UnXH1hQFtCmlgL5r6vDJouKsjaz896XvtGXjB
-ZFTa7NiUK4yrYkrXXm/Io6ElpipHhTTSzAX0SiFM5qzufLbo/6AvgWZ6+ddP/0o=
-=HBgm
+iQJ8BAEBCABmBQJTKx3IXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgjpIQAPHOyrPJWXj/17VpSmdBsDpj
+WWD7uAv6mYrxDj/Y6P2RvX/BHsJGBxC6Xvp8MhSpA5mufMqHTf3RybEecspfcmGM
+8asvIIY1s4xI22C4LMmbd3Gl8pLQehYamTjOF2r3oRBmr8TkW0Ttrbe9J6yND0fn
+CKrRSss5hN4WrO4Y/EjmQkwXqEfXymXm8+lAkKd0wR3L8Ic7EMZxp5WjREZAvioK
+DUzqB4HGRhsIaI3drmp7uFRYz52SKnm/8L1X1GN+e1Zq/cHky4+2Ep7oJwb+01bV
+r9o0o8nuZmM5+npieQrCaw+/kbdHYYwUdcZiZQTInW/k0V9D+FIT9IN1draoJzuG
+ZRaNWFJ8TYBt1lhJ1NLQtb+rJkCw4zqUhS6fsh4CF+i7PHlGcki83+8p/q5UDKjS
+imv4ah9iYnXCPK1r4V8N37cehqb+c2KkCGOWstuZ1SdRYJ86eD/kvdfP1Rq5K3ub
+9NnCuDFCVeOa0/QtWGKT2tHKFqM3ZsHjPg+vKgEvkOzXpEhACw697SIYqPBZ+Utj
+Jgh9/jqEsHMFWGRKGUUE7vaWZCUQJqKGYbZoYdhhAbUKx9DUyiSykZAN3E7Hdwgy
+4W/Qzltb4CfUWBfhSQjdN2Up0yopOSG7C4zaTbJftbiZvcV8Cv2vwH3yl0CPjgJF
+xjBwvTl8EroZslR2ir23
+=8n9+
-----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.69.ebuild b/media-gfx/blender/blender-2.69.ebuild
index ef5c4c9be278..847b7d55b108 100644
--- a/media-gfx/blender/blender-2.69.ebuild
+++ b/media-gfx/blender/blender-2.69.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.69.ebuild,v 1.2 2014/01/22 01:11:12 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.69.ebuild,v 1.3 2014/03/20 16:56:34 hasufell Exp $
# TODO:
# bundled-deps: bullet is modified
@@ -32,7 +32,7 @@ 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 )
+ redcode? ( jpeg2k ffmpeg )
cycles? ( boost openexr tiff )
nls? ( boost )
game-engine? ( boost )"
@@ -69,6 +69,7 @@ RDEPEND="
)
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
diff --git a/media-gfx/blender/blender-2.70.ebuild b/media-gfx/blender/blender-2.70.ebuild
new file mode 100644
index 000000000000..69b715d38a1d
--- /dev/null
+++ b/media-gfx/blender/blender-2.70.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.70.ebuild,v 1.1 2014/03/20 16:56:34 hasufell Exp $
+
+# TODO:
+# bundled-deps: bullet is modified
+# multiple python abi?
+
+EAPI=5
+PYTHON_COMPAT=( python3_3 )
+#PATCHSET="1"
+
+inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org"
+
+case ${PV} in
+ *_p*)
+ SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;;
+ *)
+ SRC_URI="http://download.blender.org/source/${P}.tar.gz" ;;
+esac
+
+if [[ -n ${PATCHSET} ]]; then
+ SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz"
+fi
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ player? ( game-engine )
+ redcode? ( jpeg2k ffmpeg )
+ cycles? ( boost openexr tiff )
+ nls? ( boost )
+ game-engine? ( boost )"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/gflags
+ dev-cpp/glog[gflags]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ >=media-libs/freetype-2.0
+ media-libs/glew
+ media-libs/libpng:0
+ media-libs/libsamplerate
+ sci-libs/colamd
+ sci-libs/ldl
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg
+ virtual/libintl
+ virtual/opengl
+ x11-libs/libXi
+ x11-libs/libX11
+ boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] )
+ collada? ( media-libs/opencollada )
+ colorio? ( media-libs/opencolorio )
+ cycles? (
+ media-libs/openimageio
+ )
+ ffmpeg? (
+ || (
+ >=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?]
+ >=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?]
+ )
+ )
+ fftw? ( sci-libs/fftw:3.0 )
+ jack? ( media-sound/jack-audio-connection-kit )
+ jpeg2k? ( media-libs/openjpeg:0 )
+ ndof? (
+ app-misc/spacenavd
+ dev-libs/libspnav
+ )
+ nls? ( virtual/libiconv )
+ openal? ( >=media-libs/openal-1.6.372 )
+ openimageio? ( media-libs/openimageio )
+ openexr? ( media-libs/openexr )
+ sdl? ( media-libs/libsdl[audio,joystick] )
+ sndfile? ( media-libs/libsndfile )
+ tiff? ( media-libs/tiff:0 )"
+DEPEND="${RDEPEND}
+ >=dev-cpp/eigen-3.1.3:3
+ doc? (
+ app-doc/doxygen[-nodot(-),dot(+)]
+ dev-python/sphinx
+ )
+ nls? ( sys-devel/gettext )"
+
+pkg_pretend() {
+ if use openmp && ! tc-has-openmp; then
+ eerror "You are using gcc built without 'openmp' USE."
+ eerror "Switch CXX to an OpenMP capable compiler."
+ die "Need openmp"
+ fi
+
+ if use doc; then
+ CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+ fi
+}
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \
+ "${FILESDIR}"/02-${PN}-2.68-unbundle-colamd.patch \
+ "${FILESDIR}"/03-${PN}-2.68-remove-binreloc.patch \
+ "${FILESDIR}"/04-${PN}-2.70-unbundle-glog.patch \
+ "${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \
+ "${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \
+ "${FILESDIR}"/07-${PN}-2.70-sse2.patch
+
+ # remove some bundled deps
+ rm -r \
+ extern/Eigen3 \
+ extern/libopenjpeg \
+ extern/glew \
+ extern/colamd \
+ extern/binreloc \
+ extern/libmv/third_party/{glog,gflags} \
+ || die
+
+ # turn off binreloc (not cached)
+ sed -i \
+ -e 's#set(WITH_BINRELOC ON)#set(WITH_BINRELOC OFF)#' \
+ CMakeLists.txt || die
+
+ # we don't want static glew, but it's scattered across
+ # thousand files
+ # !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+ sed -i \
+ -e '/-DGLEW_STATIC/d' \
+ $(find . -type f -name "CMakeLists.txt") || die
+
+ ewarn "$(echo "Remaining bundled dependencies:";
+ ( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')"
+
+ # linguas cleanup
+ local i
+ if ! use nls; then
+ rm -r "${S}"/release/datafiles/locale || die
+ else
+ if [[ -n "${LINGUAS+x}" ]] ; then
+ for i in "${S}"/release/datafiles/locale/* ; do
+ mylang=${i##*/}
+ has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; }
+ done
+ fi
+ fi
+}
+
+src_configure() {
+ # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+ # shadows, see bug #276338 for reference
+ append-flags -funsigned-char
+ append-lfs-flags
+
+ # WITH_PYTHON_SECURITY
+ # WITH_PYTHON_SAFETY
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DWITH_INSTALL_PORTABLE=OFF
+ $(cmake-utils_use_with boost BOOST)
+ $(cmake-utils_use_with cycles CYCLES)
+ $(cmake-utils_use_with collada OPENCOLLADA)
+ $(cmake-utils_use_with dds IMAGE_DDS)
+ $(cmake-utils_use_with elbeem MOD_FLUID)
+ $(cmake-utils_use_with ffmpeg CODEC_FFMPEG)
+ $(cmake-utils_use_with fftw FFTW3)
+ $(cmake-utils_use_with fftw MOD_OCEANSIM)
+ $(cmake-utils_use_with game-engine GAMEENGINE)
+ $(cmake-utils_use_with nls INTERNATIONAL)
+ $(cmake-utils_use_with jack JACK)
+ $(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG)
+ $(cmake-utils_use_with openimageio OPENIMAGEIO)
+ $(cmake-utils_use_with openal OPENAL)
+ $(cmake-utils_use_with openexr IMAGE_OPENEXR)
+ $(cmake-utils_use_with openmp OPENMP)
+ $(cmake-utils_use_with opennl OPENNL)
+ $(cmake-utils_use_with player PLAYER)
+ $(cmake-utils_use_with redcode IMAGE_REDCODE)
+ $(cmake-utils_use_with sdl SDL)
+ $(cmake-utils_use_with sndfile CODEC_SNDFILE)
+ $(cmake-utils_use_with sse RAYOPTIMIZATION)
+ $(cmake-utils_use_with sse2 SSE2)
+ $(cmake-utils_use_with bullet BULLET)
+ $(cmake-utils_use_with tiff IMAGE_TIFF)
+ $(cmake-utils_use_with colorio OPENCOLORIO)
+ $(cmake-utils_use_with ndof INPUT_NDOF)
+ -DWITH_PYTHON_INSTALL=OFF
+ -DWITH_PYTHON_INSTALL_NUMPY=OFF
+ -DWITH_STATIC_LIBS=OFF
+ -DWITH_SYSTEM_GLEW=ON
+ -DWITH_SYSTEM_OPENJPEG=ON
+ -DWITH_SYSTEM_BULLET=OFF
+ -DPYTHON_VERSION="${EPYTHON/python/}"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+
+ if use doc; then
+ einfo "Generating Blender C/C++ API docs ..."
+ cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+ doxygen -u Doxyfile
+ doxygen || die "doxygen failed to build API docs."
+
+ cd "${CMAKE_USE_DIR}" || die
+ einfo "Generating (BPY) Blender Python API docs ..."
+ "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed."
+
+ cd "${CMAKE_USE_DIR}"/doc/python_api || die
+ sphinx-build sphinx-in BPY_API || die "sphinx failed."
+ fi
+}
+
+src_test() { :; }
+
+src_install() {
+ local i
+
+ # Pax mark blender for hardened support.
+ pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
+
+ if use doc; then
+ docinto "API/python"
+ dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/*
+
+ docinto "API/blender"
+ dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/*
+ fi
+
+ # fucked up cmake will relink binary for no reason
+ emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast
+
+ # fix doc installdir
+ dohtml "${CMAKE_USE_DIR}"/release/text/readme.html
+ rm -rf "${ED%/}"/usr/share/doc/blender
+
+ python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py
+ python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ elog
+ elog "Blender uses python integration. As such, may have some"
+ elog "inherit risks with running unknown python scripting."
+ elog
+ elog "It is recommended to change your blender temp directory"
+ elog "from /tmp to /home/user/tmp or another tmp file under your"
+ elog "home directory. This can be done by starting blender, then"
+ elog "dragging the main menu down do display all paths."
+ elog
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/blender/files/04-blender-2.70-unbundle-glog.patch b/media-gfx/blender/files/04-blender-2.70-unbundle-glog.patch
new file mode 100644
index 000000000000..4c9f14aea7c3
--- /dev/null
+++ b/media-gfx/blender/files/04-blender-2.70-unbundle-glog.patch
@@ -0,0 +1,106 @@
+commit 26e853d31931a8bb08695aa98ae53b263236d407
+Author: hasufell <hasufell@gentoo.org>
+Date: Fri Jul 19 18:40:23 2013 +0200
+
+ unbundle glog/gflags
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b1a7830..a30831c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,6 +106,14 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE)
+ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
+
+ #-----------------------------------------------------------------------------
++# Check for some modules
++if(UNIX)
++ find_package(PkgConfig)
++ pkg_check_modules(_PC_GFLAGS libgflags)
++ pkg_check_modules(_PC_GLOG libglog)
++endif()
++
++#-----------------------------------------------------------------------------
+ # Set default config options
+
+ get_blender_version()
+diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
+index 2c9a219..7061e04 100644
+--- a/extern/libmv/CMakeLists.txt
++++ b/extern/libmv/CMakeLists.txt
+@@ -87,10 +87,6 @@
+ libmv/tracking/track_region.cc
+ libmv/tracking/trklt_region_tracker.cc
+
+- third_party/gflags/gflags.cc
+- third_party/gflags/gflags_completions.cc
+- third_party/gflags/gflags_reporting.cc
+-
+ libmv/base/id_generator.h
+ libmv/base/scoped_ptr.h
+ libmv/base/vector.h
+@@ -140,12 +136,6 @@
+ libmv/tracking/track_region.h
+ libmv/tracking/trklt_region_tracker.h
+
+- third_party/gflags/config.h
+- third_party/gflags/gflags/gflags_completions.h
+- third_party/gflags/gflags/gflags_declare.h
+- third_party/gflags/gflags/gflags.h
+- third_party/gflags/mutex.h
+- third_party/gflags/util.h
+ third_party/msinttypes/inttypes.h
+ third_party/msinttypes/stdint.h
+ )
+@@ -186,42 +176,6 @@
+ third_party/msinttypes
+ )
+ endif()
+- else()
+- list(APPEND SRC
+- third_party/glog/src/demangle.cc
+- third_party/glog/src/logging.cc
+- third_party/glog/src/raw_logging.cc
+- third_party/glog/src/signalhandler.cc
+- third_party/glog/src/symbolize.cc
+- third_party/glog/src/utilities.cc
+- third_party/glog/src/vlog_is_on.cc
+-
+- third_party/glog/src/base/commandlineflags.h
+- third_party/glog/src/base/googleinit.h
+- third_party/glog/src/base/mutex.h
+- third_party/glog/src/config_freebsd.h
+- third_party/glog/src/config.h
+- third_party/glog/src/config_hurd.h
+- third_party/glog/src/config_linux.h
+- third_party/glog/src/config_mac.h
+- third_party/glog/src/demangle.h
+- third_party/glog/src/glog/logging.h
+- third_party/glog/src/glog/log_severity.h
+- third_party/glog/src/glog/raw_logging.h
+- third_party/glog/src/glog/vlog_is_on.h
+- third_party/glog/src/stacktrace_generic-inl.h
+- third_party/glog/src/stacktrace.h
+- third_party/glog/src/stacktrace_libunwind-inl.h
+- third_party/glog/src/stacktrace_powerpc-inl.h
+- third_party/glog/src/stacktrace_x86_64-inl.h
+- third_party/glog/src/stacktrace_x86-inl.h
+- third_party/glog/src/symbolize.h
+- third_party/glog/src/utilities.h
+- )
+-
+- list(APPEND INC
+- third_party/glog/src
+- )
+ endif()
+ else()
+ list(APPEND SRC
+@@ -229,7 +183,9 @@
+ )
+ endif()
+
++include_directories(${_PC_GFLAGS_INCLUDE_DIRS} ${_PC_GLOG_INCLUDE_DIRS})
+ blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}")
++target_link_libraries(extern_libmv ${_PC_GFLAGS_LIBRARIES} ${_PC_GLOG_LIBRARIES})
+
+ if(WITH_LIBMV)
+ add_subdirectory(third_party)
diff --git a/media-gfx/blender/files/07-blender-2.70-sse2.patch b/media-gfx/blender/files/07-blender-2.70-sse2.patch
new file mode 100644
index 000000000000..6fc870ea3258
--- /dev/null
+++ b/media-gfx/blender/files/07-blender-2.70-sse2.patch
@@ -0,0 +1,35 @@
+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 @@
+ #-----------------------------------------------------------------------------
+ # Load some macros.
+ include(build_files/cmake/macros.cmake)
++include(CMakeDependentOption)
+
+
+ #-----------------------------------------------------------------------------
+@@ -251,6 +252,7 @@
+ # Misc
+ option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
+ option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
++cmake_dependent_option(WITH_SSE2 "SSE2 optimizations" ON WITH_RAYOPTIMIZATION OFF)
+ option(WITH_OPENNL "Enable use of Open Numerical Library" ON)
+ if(UNIX AND NOT APPLE)
+ option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
+@@ -1950,7 +1952,7 @@
+ set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}")
+ add_definitions(-D__SSE__ -D__MMX__)
+ endif()
+- if(SUPPORT_SSE2_BUILD)
++ if(WITH_SSE2 AND SUPPORT_SSE2_BUILD)
+ set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}")
+ add_definitions(-D__SSE2__)
+ if(NOT SUPPORT_SSE_BUILD) # dont double up
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index d19b5441a75b..c0fc447a00d6 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -67,6 +67,8 @@
</flag>
<flag name="ndof">
Enable NDOF input devices (SpaceNavigator and friends).
- </flag>
+ </flag>
+ <flag name="openimageio">Enable OpenImageIO Support</flag>
+ <flag name="opennl">Enable use of Open Numerical Library</flag>
</use>
</pkgmetadata>