From 4bc81358612eab63a2803b22850c9f3532ec132e Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Mon, 22 Dec 2014 15:46:08 +0000 Subject: [PATCH] revbump for adding missing fix for T42797, rm old Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xBDEED020 --- media-gfx/blender/ChangeLog | 15 +- media-gfx/blender/Manifest | 41 +-- ....72b-r1.ebuild => blender-2.72b-r2.ebuild} | 5 +- media-gfx/blender/blender-2.72b.ebuild | 292 --------------- .../files/01-blender-2.68-doxyfile.patch | 19 - .../02-blender-2.71-unbundle-colamd.patch | 52 --- .../files/04-blender-2.71-unbundle-glog.patch | 56 --- .../05-blender-2.72-unbundle-eigen3.patch | 334 ------------------ .../06-blender-2.68-fix-install-rules.patch | 26 -- .../blender/files/07-blender-2.70-sse2.patch | 35 -- .../files/08-blender-2.71-gflags.patch | 59 ---- .../09-blender-2.72b-unbundle-minilzo.patch | 53 --- 12 files changed, 33 insertions(+), 954 deletions(-) rename media-gfx/blender/{blender-2.72b-r1.ebuild => blender-2.72b-r2.ebuild} (98%) delete mode 100644 media-gfx/blender/blender-2.72b.ebuild delete mode 100644 media-gfx/blender/files/01-blender-2.68-doxyfile.patch delete mode 100644 media-gfx/blender/files/02-blender-2.71-unbundle-colamd.patch delete mode 100644 media-gfx/blender/files/04-blender-2.71-unbundle-glog.patch delete mode 100644 media-gfx/blender/files/05-blender-2.72-unbundle-eigen3.patch delete mode 100644 media-gfx/blender/files/06-blender-2.68-fix-install-rules.patch delete mode 100644 media-gfx/blender/files/07-blender-2.70-sse2.patch delete mode 100644 media-gfx/blender/files/08-blender-2.71-gflags.patch delete mode 100644 media-gfx/blender/files/09-blender-2.72b-unbundle-minilzo.patch diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index efb6c809b326..44d41423b642 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,19 @@ # 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.282 2014/12/22 15:41:27 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.283 2014/12/22 15:46:07 hasufell Exp $ + +*blender-2.72b-r2 (22 Dec 2014) + + 22 Dec 2014; Julian Ospald -blender-2.72b.ebuild, + -blender-2.72b-r1.ebuild, +blender-2.72b-r2.ebuild, + -files/01-blender-2.68-doxyfile.patch, + -files/06-blender-2.68-fix-install-rules.patch, + -files/07-blender-2.70-sse2.patch, -files/08-blender-2.71-gflags.patch, + -files/02-blender-2.71-unbundle-colamd.patch, + -files/04-blender-2.71-unbundle-glog.patch, + -files/05-blender-2.72-unbundle-eigen3.patch, + -files/09-blender-2.72b-unbundle-minilzo.patch: + revbump for adding missing fix for T42797, rm old 22 Dec 2014; Julian Ospald +files/blender-2.68-doxyfile.patch, diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 7f82e1263f5c..ca572f41af26 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,39 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX 01-blender-2.68-doxyfile.patch 732 SHA256 d485da5bdf1f123d945b8f945a84ead947ff123b4126a626bb394256ea07cbec SHA512 5191a25127e24d3ac7b18f6cd0b247e76a3fdeec46640f5d1ecba118fa35abbdaf19642c718e85149a304e9dc2093465b54b96e343f125163d091f045ab09db7 WHIRLPOOL 5cfdb697bf18aa50488495d017feda2e071332996a72e1a3c347291034c7230ad63c89e38670a86df633d3dc8359962e8888e4f0f1a2fa0b478acdb33a8f4d64 -AUX 02-blender-2.71-unbundle-colamd.patch 1592 SHA256 d86234ea75cec01786685e985a6f0f13b60f4fbd296e906d96a24beed9118598 SHA512 f3656380c588ebc54f327e1997e0b0f6fc9b2f3ac6fa2fcae6eb2c217503d5567fb88972d8eec4dd3a1f0dea0aee9171914d0436042d672c097e8777d31ff76b WHIRLPOOL bb8ece004007b4b25a7c772c0a2e8ccdb6ed21e5ab265446465feecd99c803434e0093e9e580893fdda34489cb4c404a56a46f09684a5f3854f23dd2f856eede -AUX 04-blender-2.71-unbundle-glog.patch 1650 SHA256 bec78cb9ec67f5a5fafdca06bf796c8e9a4f531fbf3ab78ebe124df317e9c8eb SHA512 92eaca756e5b0c6c1c958cb58a47b9aeb87dcd6494ec7a7fee83ec06887e3fa323886e44cfcc968e40f4cb99a352cdba56ea25c6c5a051b769101e0ae3eecdc1 WHIRLPOOL 54e65ec7e42d4e847caec17312b53e349fb40d2bac0a924ca7cedddaf8773acb30750a1f903b4c9c142c04d2ba76095a16ab50043ab1112b198bca5e048ef202 -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.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.72b-unbundle-minilzo.patch 1170 SHA256 17464deac2c2536b671e16415fc3d37077727f558f8b36e1405ccf179f3c563b SHA512 d062628c837b1f4889bc9616b0814abc27c38cb1f7a77d9276846dccc12c148f22d4647d9aabb41ec342c7c52a4fad95c110869d9599c5204f803a5fb237eed2 WHIRLPOOL 69719041ebe17430fccc45875f08a64c34431c0f6f9e744d2b7d1a3b82c358a69ecbe5d8033eae63d112fcb60ffff108dc03a6b9dad7f0bbdd9c014046781dbc AUX blender-2.68-doxyfile.patch 732 SHA256 d485da5bdf1f123d945b8f945a84ead947ff123b4126a626bb394256ea07cbec SHA512 5191a25127e24d3ac7b18f6cd0b247e76a3fdeec46640f5d1ecba118fa35abbdaf19642c718e85149a304e9dc2093465b54b96e343f125163d091f045ab09db7 WHIRLPOOL 5cfdb697bf18aa50488495d017feda2e071332996a72e1a3c347291034c7230ad63c89e38670a86df633d3dc8359962e8888e4f0f1a2fa0b478acdb33a8f4d64 AUX blender-2.68-fix-install-rules.patch 740 SHA256 93ae6cc8cfbb2ce856adf7a0dbf5966843630edaa4d7828de42d1bb5ba76058d SHA512 dd21cb3aa8bf965631132d39ad8a43c15d0c32faeaee00e8b8a970108fba0ab43b2402e3637dcd0b3430b7023ac9203b0395bbd2dc2dd9eb80d8c1d994d89e4f WHIRLPOOL 7c86d7637fdbf1d4c1f631b6a47c7e02399a00976189acaf9fc041765419cd2ffaaaab0d6fb05f4ba67024d14cfc778f3620f9d6cbf89e81b16a467e45beac75 AUX blender-2.70-sse2.patch 1421 SHA256 b20d9aba206543e765e147e7740aff48ef968b90620d9d4b902cb6c23b9ba28f SHA512 9888110efaab16ec15438ad463c3ffa0bb4f64c23bb162254abe0ddb4acd42935a5fd1fdbf186b1cf1dad042044f8777b5f58c446423894788c655187bfe3cca WHIRLPOOL c3990dac70078a13ba005da5b649b9b72bdf04313551f2e41d639efc6a666006e1af54f11bb8c82608956df03547297303bf7a8a6e8cd03364d994910bde60c7 AUX blender-2.72-T42797.diff 338 SHA256 96ea23f8c588dff6a91415fbb69d007bf4ae4d46e5579d2d7421efb0abaa37fc SHA512 a659582b36f8f07bb866fbd97a4393b186e527dabf76c2ab7112a7f0b96504d077cf5ab0422c6eca53c3c70583caa2d280e0fa1f4454d1935ad8d764079f0d84 WHIRLPOOL 1f1d3e50e52f3e9c92db6950f35cafea3410c1bcb109af1e5c91fab289a3c841ab0489164fe81e99c2d8b8ae8ccd5ee6114233ecdadfbf09eb8b67bbfe43461e DIST blender-2.72b.tar.gz 52018242 SHA256 4436c704afa28e2e5e7b28b2c06981806ddedab70565d40972e422c00644bf47 SHA512 9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124 WHIRLPOOL 3687255bc9f4195b25b66a75630676ee15e67cf10a058dca11b3472617b54aae2bebb1810cc16e19c58ca1c09b1ea8b70f72e30c05632ab0bae8910925a37a54 -EBUILD blender-2.72b-r1.ebuild 7744 SHA256 45f7cf1d7746fb3b62421e91e09fd76cf9c4528a3cee5d8d40d5a9e32ea8bee4 SHA512 fe290de911203ba7b26eed438fa045c31223dedc7c1bf50e69435ee1530f0cf80ff3c57c414888a2fe5718725a3d29fe9b629091920c5e48e67ca0ba0fa10ade WHIRLPOOL 0c6d89c168a05ef8ed36dc0c4b08fa130e9b827a9df28e8c2a1907e01f34c297df2ebed436628330d45462507d71334431c5f2c7a1eee7e309aa069b0fcab9ea -EBUILD blender-2.72b.ebuild 8116 SHA256 00d94fb5af67341b3dd7f218dbb351c6cef2e333dc1bc99af94b58231ff557e2 SHA512 5842be5a16bb893925093e203ca45892791460f2b2e0349337959b724a3df54781731c1d102384773f0f9bbf3bab86d0b21c1bd840eaaad891c5e989b8123f15 WHIRLPOOL 0e25ce96505aaf2752de86e61c62779b52c5b5e0d307dddb61b170e3f3287daec38338de0e7f1287327769b52977097ec601146e070ed48e1374e08bca04eb5c -MISC ChangeLog 50629 SHA256 92319d9208b914af011e86ab536bfc0ee796d4f9b2744c5d64632c651479c79d SHA512 caf4be910ddffda3b1ebcdabfc4bd50c1f6b0e79bbf285d7e35b718fa8aa05335d5594c66cd15da5d2c3629109a8c33bf461927f5ad9d76c0381c13566cdcc8b WHIRLPOOL b21865f8c11354d26896fba85118f7c5e6c7524d2026a4ff692333efa1f3dc865d5f20860ebb1fb9d17dfe737c2c74d41028d785fc00d6c5276f3f67b5fccef3 +EBUILD blender-2.72b-r2.ebuild 7788 SHA256 3491128b20a1fb9349c2c6e331ef6494622ff67e3d0299fa40532d8ab2f3c856 SHA512 020001d9fb86d77d337de647c073ceaf3359bcdb4f87182479a432bc5171530d749855858be016c6ee54a601be5206f12fe69b9587fdb4104cb6c829f60de79e WHIRLPOOL e75245054eee935d48a04e25dd555d630bd52cfafd5f2ff10766c59956e237d896917af5f3b74c959111993eb3fa65bfaa851df879ed96e43ce056284bb3ef96 +MISC ChangeLog 51200 SHA256 1dc0d25a105dd06b8550e0d54aed83c341801903beae491e3c9d9a798736fb84 SHA512 9dc291ea4d2c1cf01794fdd68cae4c0ef1df8747bb9e7f9c01a9c75d255fc7c714e232b69e9e69955a2f8aacd66a49b8805cc90cf4fc50baaf748321ca67e4f3 WHIRLPOOL 6ab87994a42618249674c662b1d1bd2ffdc40e89ecc3cf3a1750075fd856f623589585f26ba9fcc7459fcb234339501c78421021cda69f4f79f4f874ede03735 MISC metadata.xml 1943 SHA256 442b4b8f917e536321467f5b4408d6530fc8030db5d3efa532a007aaa81defb0 SHA512 8a18cfb1afc6e465c3e10698470794971c2b967f914332421817bbe1c6dc92372d61139803d3b5b7bdd5fd6a80c53b0eb2d0554ae8b41e5d5e4b75de30969a0c WHIRLPOOL 9ab06cf2763dbedc21723e36e9afa72710d8299f602c63152345ea3c67ea3398d8e7ac0c6b4b1c37a2767cb6598b5a76d793ab300483a052c00e6789f08f648c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUmDupXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJUmDy+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy -MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgoK8P/0D8Pg6q8lcLCt3PtbxcGG/X -dL6++1NFFhwQrZgbgAVmA/ZlkdI7puQhrpGDqlYyC/9SOcUs0X+5KkqSIiSdjbIJ -CTIB6p3rCqJJcf1k04dCcOuf0OXer71nEmeMIpTq/uRRjxm+eREVCgnnM9y26tMt -5oSx+b6fIb5GVKl4B3hlt1cEK2raZFjCEGhp8YUFqSR+8Q5aSplurKEtDHS2m2Pc -xyTuQNFt0biXRAa0FxBRs2NbilYbiYkURTQGEUkSmiZhA2p3worP1FaPPOLhIqec -3j4jLMsnkDlPIzEszqpeR2bzIvL7doBVUOnKEsCzvCR/0X2qg1PlApgKBkV1UBZi -Hi5kvsh1vo1+mgdKU1bIT/l4SXXyoU+aS89S6I22w/DYSpdSrKzFa9No2mbpBt8I -xIwCGoU1h5uieWem2c8xymoq99Xzs9zapPzFpfuSKCuAGSo0HWoxhKkyWEwy4rZ9 -iXzWQDAKqo33bJfd2habJo1BlJqTWNrkC1hyogIyASkEbkgk4xu3bLZLIqrB3ugr -OUAErIiL+sxdQBiMsEupToe7dCAJ0kTpY+Gpeduv3XprO08dpmh+L6o1RlqEyuKm -F5a56bKax91P+NBuk2oAwo7VsPSEpHEpwbca8+wzC6s7NbdrcrkD1LIAGkrLbDdw -2V7DTDhk0fUUX4+KTm0M -=+ADA +MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgLFEQALVco9bWdd8lstS38ZaXXdiF +fKQPoAfBv+5yNUcQXX+4YobthS2RjPNyhgCcND6sTVsTh8dQoNCMDzT6KkWvUeln +BsCfOzaNVV9d9xHCbctf1gaBna5KgASFBZhZJKLDMZZ1WWveEMmP0ua6/4yGYzmv +WDljAhhX7a2RB6O9xsIlZpPFaRkZqG+1RUwsvojUoB9qo+SRQgJh48RKLA6Pv3i5 +xVkFqPYr+cUCorCcPbelIzDHpXSY8gEb1UqvK+HNbE+9GvuPLPr698dY/32fBfsz +ef1+NwYfB9AbiHJuRD97GO9bUOaIXyXs9BeP6NIcfCanyRQmU9ogUbNmYtspLGCE +dm0cYG96Ywm8f1rcyaQA5vWeGX6sZV3mAv2qCTQ1CW/7GE3D7evfsVUa9sZaP9zw +0Kf+5jwy63Ue12CBimuP3Cp7n4tCd+9d/ISrWYEBSn87zguR1Ag5PstJyURpXdBF +n5xevxVlLEJo+kjsubkmIXWYISELNU9d92K/JCjFWbZWj1j1vtmo9Hf2esod9seo +GWbEygPHf24Xyp8Jgc17szbBCjvUeNQYqV3wUsoUAVUYwEh+gvb6En0oDObdIgUW +T9tJgysHQUhYV3ndXUk2u7c5SvLtF+op5OOgLRYV0xxg3SELDd6+2XaOat90Dcoy ++j2KgGTgLh800WJBu6UC +=mP35 -----END PGP SIGNATURE----- diff --git a/media-gfx/blender/blender-2.72b-r1.ebuild b/media-gfx/blender/blender-2.72b-r2.ebuild similarity index 98% rename from media-gfx/blender/blender-2.72b-r1.ebuild rename to media-gfx/blender/blender-2.72b-r2.ebuild index 462a8c3c3fcc..d0d046172c83 100644 --- a/media-gfx/blender/blender-2.72b-r1.ebuild +++ b/media-gfx/blender/blender-2.72b-r2.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.72b-r1.ebuild,v 1.2 2014/12/21 22:31:45 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.72b-r2.ebuild,v 1.1 2014/12/22 15:46:07 hasufell Exp $ ## BUNDLED-DEPS: # extern/cuew @@ -126,7 +126,8 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${PN}-2.68-doxyfile.patch \ "${FILESDIR}"/${PN}-2.68-fix-install-rules.patch \ - "${FILESDIR}"/${PN}-2.70-sse2.patch + "${FILESDIR}"/${PN}-2.70-sse2.patch \ + "${FILESDIR}"/${PN}-2.72-T42797.diff epatch_user diff --git a/media-gfx/blender/blender-2.72b.ebuild b/media-gfx/blender/blender-2.72b.ebuild deleted file mode 100644 index 079bcf83f618..000000000000 --- a/media-gfx/blender/blender-2.72b.ebuild +++ /dev/null @@ -1,292 +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.72b.ebuild,v 1.3 2014/12/17 16:45:22 hasufell Exp $ - -## BUNDLED-DEPS: -# extern/recastnavigation -# extern/libmv -# extern/clew -# extern/bullet2 -# extern/wcwidth -# extern/cuew -# extern/carve -# extern/xdnd -# extern/binreloc -# extern/libredcode -# extern/gtest -# extern/rangetree -# extern/lzma -# extern/libmv/third_party/ceres -# extern/libmv/third_party/msinttypes - -# 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.72b-unbundle-minilzo.patch \ - "${FILESDIR}"/${PN}-2.72-T42797.diff - - 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/01-blender-2.68-doxyfile.patch b/media-gfx/blender/files/01-blender-2.68-doxyfile.patch deleted file mode 100644 index c11c793fda97..000000000000 --- a/media-gfx/blender/files/01-blender-2.68-doxyfile.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 62308d9fc24bde22a50497816c44c8ca91f96f63 -Author: hasufell -Date: Fri Jul 19 18:36:34 2013 +0200 - - remove hhc.exe reference - -diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile -index 397cc30..ac61756 100644 ---- a/doc/doxygen/Doxyfile -+++ b/doc/doxygen/Doxyfile -@@ -1051,7 +1051,7 @@ CHM_FILE = blender.chm - # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run - # the HTML help compiler on the generated index.hhp. - --HHC_LOCATION = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe" -+HHC_LOCATION = - - # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag - # controls if a separate .chi index file is generated (YES) or that diff --git a/media-gfx/blender/files/02-blender-2.71-unbundle-colamd.patch b/media-gfx/blender/files/02-blender-2.71-unbundle-colamd.patch deleted file mode 100644 index ee062fe687f5..000000000000 --- a/media-gfx/blender/files/02-blender-2.71-unbundle-colamd.patch +++ /dev/null @@ -1,52 +0,0 @@ -commit f6af85bef74ae6d1df1e811db7274829e50f10a9 -Author: hasufell -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 extern_carve) - endif() -@@ -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 -@@ -889,6 +889,6 @@ - - setup_blender_sorted_libs() - --target_link_libraries(blender ${BLENDER_SORTED_LIBS}) -+target_link_libraries(blender ${BLENDER_SORTED_LIBS} colamd) - - setup_liblinks(blender) diff --git a/media-gfx/blender/files/04-blender-2.71-unbundle-glog.patch b/media-gfx/blender/files/04-blender-2.71-unbundle-glog.patch deleted file mode 100644 index 5f5c1aef332a..000000000000 --- a/media-gfx/blender/files/04-blender-2.71-unbundle-glog.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 26e853d31931a8bb08695aa98ae53b263236d407 -Author: hasufell -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 -@@ -47,8 +47,6 @@ - ) - - list(APPEND INC -- third_party/gflags -- third_party/glog/src - third_party/ceres/include - ../../intern/guardedalloc - ) -@@ -208,7 +206,10 @@ - ) - 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) -@@ -299,5 +300,5 @@ - set(GLOG_INC_SYS - ) - -- blender_add_lib(extern_glog "${GLOG_SRC}" "${GLOG_INC}" "${GLOG_INC_SYS}") -+ # blender_add_lib(extern_glog "${GLOG_SRC}" "${GLOG_INC}" "${GLOG_INC_SYS}") - endif() diff --git a/media-gfx/blender/files/05-blender-2.72-unbundle-eigen3.patch b/media-gfx/blender/files/05-blender-2.72-unbundle-eigen3.patch deleted file mode 100644 index 3cfc62fa1730..000000000000 --- a/media-gfx/blender/files/05-blender-2.72-unbundle-eigen3.patch +++ /dev/null @@ -1,334 +0,0 @@ -commit 03b41be3de15b4810e55ff1988d27d28eb358df0 -Author: hasufell -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_DIRS} - ${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/06-blender-2.68-fix-install-rules.patch b/media-gfx/blender/files/06-blender-2.68-fix-install-rules.patch deleted file mode 100644 index aa8ecc9f6174..000000000000 --- a/media-gfx/blender/files/06-blender-2.68-fix-install-rules.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 94eed33f878e35a8c7b69b0c23b3b30026460f33 -Author: hasufell -Date: Fri Jul 19 18:50:08 2013 +0200 - - remove stupid uninstall snippet - - whoever coded this... it is dangerous - uninstall methods have NO PLACE in install rules - -diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt -index c84d944..2b9bf46 100644 ---- a/source/creator/CMakeLists.txt -+++ b/source/creator/CMakeLists.txt -@@ -268,12 +268,6 @@ endif() - # Install Targets (Generic, All Platforms) - - --# important to make a clean install each time, else old scripts get loaded. --install( -- CODE -- "file(REMOVE_RECURSE ${TARGETDIR_VER})" --) -- - if(WITH_PYTHON) - # install(CODE "message(\"copying blender scripts...\")") - diff --git a/media-gfx/blender/files/07-blender-2.70-sse2.patch b/media-gfx/blender/files/07-blender-2.70-sse2.patch deleted file mode 100644 index 6fc870ea3258..000000000000 --- a/media-gfx/blender/files/07-blender-2.70-sse2.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 0e0b27a589680e10e38a26575ad4dba8f3af2ec6 -Author: hasufell -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/files/08-blender-2.71-gflags.patch b/media-gfx/blender/files/08-blender-2.71-gflags.patch deleted file mode 100644 index 9718398ef03d..000000000000 --- a/media-gfx/blender/files/08-blender-2.71-gflags.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- ./CMakeLists.txt 2014-07-15 17:30:36.608718963 -0400 -+++ ./CMakeLists.txt 2014-07-15 17:25:24.940615350 -0400 -@@ -116,6 +116,7 @@ - # Check for some modules - if(UNIX) - find_package(PkgConfig) -+ find_package(gflags REQUIRED) - pkg_check_modules(_PC_EIGEN3 eigen3) - pkg_check_modules(_PC_GFLAGS libgflags) - pkg_check_modules(_PC_GLOG libglog) ---- extern/libmv/CMakeLists.txt 2014-07-15 17:30:36.565719500 -0400 -+++ extern/libmv/CMakeLists.txt 2014-07-15 17:25:06.388847279 -0400 -@@ -208,7 +208,7 @@ - - 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}) -+target_link_libraries(extern_libmv ${gflags_LIBRARIES} ${_PC_GLOG_LIBRARIES}) - - - if(WITH_LIBMV) ---- extern/libmv/libmv-capi.cc 2014-06-25 16:43:52.000000000 -0400 -+++ extern/libmv/libmv-capi.cc 2014-07-15 09:29:04.332922116 -0400 -@@ -112,18 +112,18 @@ - google::GLOG_FATAL); - - google::InitGoogleLogging(argv0); -- google::SetCommandLineOption("logtostderr", "1"); -- google::SetCommandLineOption("v", "0"); -- google::SetCommandLineOption("stderrthreshold", severity_fatal); -- google::SetCommandLineOption("minloglevel", severity_fatal); -+ gflags::SetCommandLineOption("logtostderr", "1"); -+ gflags::SetCommandLineOption("v", "0"); -+ gflags::SetCommandLineOption("stderrthreshold", severity_fatal); -+ gflags::SetCommandLineOption("minloglevel", severity_fatal); - } - - void libmv_startDebugLogging(void) - { -- google::SetCommandLineOption("logtostderr", "1"); -- google::SetCommandLineOption("v", "2"); -- google::SetCommandLineOption("stderrthreshold", "1"); -- google::SetCommandLineOption("minloglevel", "0"); -+ gflags::SetCommandLineOption("logtostderr", "1"); -+ gflags::SetCommandLineOption("v", "2"); -+ gflags::SetCommandLineOption("stderrthreshold", "1"); -+ gflags::SetCommandLineOption("minloglevel", "0"); - } - - void libmv_setLoggingVerbosity(int verbosity) -@@ -131,7 +131,7 @@ - char val[10]; - snprintf(val, sizeof(val), "%d", verbosity); - -- google::SetCommandLineOption("v", val); -+ gflags::SetCommandLineOption("v", val); - } - - /* ************ Planar tracker ************ */ diff --git a/media-gfx/blender/files/09-blender-2.72b-unbundle-minilzo.patch b/media-gfx/blender/files/09-blender-2.72b-unbundle-minilzo.patch deleted file mode 100644 index 06ded78d1d8c..000000000000 --- a/media-gfx/blender/files/09-blender-2.72b-unbundle-minilzo.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Julian Ospald -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,7 +84,7 @@ - #endif - - #ifdef WITH_LZO --#include "minilzo.h" -+#include - #define LZO_HEAP_ALLOC(var,size) \ - lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ] - #endif ---- 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() -- 2.26.2