diff options
| -rw-r--r-- | media-gfx/blender/ChangeLog | 9 | ||||
| -rw-r--r-- | media-gfx/blender/Manifest | 34 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.71-r2.ebuild | 276 | ||||
| -rw-r--r-- | media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch | 111 | ||||
| -rw-r--r-- | media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch | 59 |
5 files changed, 473 insertions, 16 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index 9b01ecb52e63..91f703e4380f 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.272 2014/09/27 12:45:45 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.273 2014/09/27 14:55:43 hasufell Exp $ + +*blender-2.71-r2 (27 Sep 2014) + + 27 Sep 2014; Julian Ospald <hasufell@gentoo.org> +blender-2.71-r2.ebuild, + +files/04-blender-2.71-r2-unbundle-glog.patch, + +files/09-blender-2.72-unbundle-minilzo.patch: + re-add 2.71 with fixed Manifest wrt #523328 and unbundle minilzo wrt #515266 27 Sep 2014; Julian Ospald <hasufell@gentoo.org> -blender-2.66-r1.ebuild, -blender-2.67b-r1.ebuild, -blender-2.68.ebuild, -blender-2.68a.ebuild, diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 7ac89cee5246..f61f72c33919 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -5,6 +5,7 @@ AUX 01-blender-2.68-doxyfile.patch 732 SHA256 d485da5bdf1f123d945b8f945a84ead947 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 @@ -12,28 +13,31 @@ AUX 06-blender-2.68-fix-install-rules.patch 740 SHA256 93ae6cc8cfbb2ce856adf7a0d 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 1297 SHA256 a3e566f814b52524eb5168c0a0971e19622459aad13c4ccaf9afbf201fcf34ec SHA512 378f3dff576ea6bf2754abd347d003b30490ff58e8122aa0fbe739a806037a90bc7778f728233f959d3102dc9c82956a7dc4a9ec320ea52adf5de31ca49ffbfc WHIRLPOOL d5390b328ce6cd970f43d7d80977c5f8cd79f08569468105c902649483f392636f43b662719abe7ea020a94f1329fe59ad0b1bef0b15734b3b5ae30a5269c49a 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 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.ebuild 7673 SHA256 fa153e27698a0a7e8e36aed8f7c1fdcdeac6d00f65d72c9997129ee26b36c86c SHA512 108e1c275f3a42007ab6b91e5773590acf61703f622ebbf62d9ec31312cab4dc7e526edade7378dcac3624b2eab852b4c0dcf221c8081e89b6c90bbaf7d83155 WHIRLPOOL deef57c51751dd8f532e35438f0f191f4537900fc08811416d0d37056e8b84140d94e499a3387d7a45cb29de9be31aef893bcd2bc81a2615ac4c8ae5476222bd -MISC ChangeLog 48758 SHA256 d63325b9eb6dfbf024322032fa8f85bf4212a31579eac3f8e3eee5c7b915853c SHA512 1578522cf7404925d7015098ba8a5e6fadd734801be743d1101bda96d3fe4752a7e718702586a373b229a6d8b66741238d8c216805e7efb91f7ad9f8bedf3eb0 WHIRLPOOL cefc189d6b2595ecfde7b19436f8961109e261a5da3ef5c88f418030732c2c13bf7dd08f59efc66a70d79b56ea096121e4dba289d693e2a77c39d8665a84dd44 +MISC ChangeLog 49044 SHA256 35010b08251157ae8d281ccece384dca289e1a3161b8674b91890cc043911982 SHA512 637f0882e8cb37299f23d57ded84af4e0a486b2df2b7983fd837f5b740f992023fadecafe67b86094322be850be199e1d45ffb5c0633172104c6e10093e62f2e WHIRLPOOL dd222d6c8930dee3d9d2b4a875d6c6291716322ce9840cede1178320655570d86808b9c2a228dd6f30dbe12bbba739c1c70f40a6f1d907bacc8b3b9c3d37ef0a MISC metadata.xml 1943 SHA256 442b4b8f917e536321467f5b4408d6530fc8030db5d3efa532a007aaa81defb0 SHA512 8a18cfb1afc6e465c3e10698470794971c2b967f914332421817bbe1c6dc92372d61139803d3b5b7bdd5fd6a80c53b0eb2d0554ae8b41e5d5e4b75de30969a0c WHIRLPOOL 9ab06cf2763dbedc21723e36e9afa72710d8299f602c63152345ea3c67ea3398d8e7ac0c6b4b1c37a2767cb6598b5a76d793ab300483a052c00e6789f08f648c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUJrF9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJUJs/zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy -MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAg5t4P/Rjh5KpwJXQgw8n/d5Vb+ZpN -z57son/TnKe5+WpTDzgD6Q2Xbbq7fGtDcvWnk1I4cIseFvs97cz+Xt0ktT0vpZ6c -h1iK5zeYLEniqd57rs4f+49z+U/0VkFzmbeGe0t84QmgRw7iTw6Sbp5vQCHFOHJb -xmQHq8mWom0IsI9u+JIZ425g5S6nFyLO757CQc4nuchsiJ687O1IswqWPW1xqiUr -QfXXIFybeqtnIW56/Oggc2soNH1oi2yGBXjj3eHFCXoEP+HwMzzrot7FvQy+MPsT -Jmt5xMjvl/0sn/5shmxclKSr5ntCnDTB8aGbYHMaGkbW0fxf1o0LkNxRyTLUqn1a -eGTDbpK2GYgpt1BE6BlplwiwmT+Mez47kKKTmjCSo88aKOPpgFRdFqlfoHkJ/usU -fTFqpBf8G6GfgyP7R0+mfc285QsCdB89GxZmF6ERvmduVB4M/yetXrZVt0YcmxS2 -T7Wp5zGMlkr7JyfycusV5U2ob3HqmySr8uyyqdf45cnw47vLtpLvW+KYWEytmn0D -v374uo0ZAadX49Izph0vTk70vyqwHnJWiROUDU7UmD1KtV7L3whMQKPNdMoro7Cy -d/68rvgIPUidGV2Yg/N/4e/8UGDF08U7TOPChjYhISgS2kF3+5HMZ86uiQ2zUGPC -5JokZrdUGpZ4mJuY7ydi -=DG2y +MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgtU4P/iMf3lSVH9VDI7wif9ry2Evy +CZec2ksMZ/YKe83Rw1c1pJLYBWjO85u4U6X3AXwzW+5THEBh7cNvEXWuldDNbdtf +6DxwZHEDyXXn7ac9itRfT7B/eZthwAPb+uxqKlFw2YkL/sx3bdyR949RbnXushYv +YHz0pP20QX8iiLYXfsK2hxArhZLfbqlSr5rtpTF/a18dOp+wRnKqX7iIJK0ye1Nc +WXA1HuVMwaw5qf/YmoDdIJYP09I066pqsyA5JuC1UtpIo5iQRHCtUs5QfcLNc5SQ +lG04PjWhXwk1ptgqfN5Mrf63m1Vnfjfp0KWzzjA2RUCUfvrvS1XMgIkO8nB6bmmh +dQ9X7ttAygC04e/pUPd/h3kf/N5OCUAkF/EnxSOm93epHCU7UFnSbBvMvuCQ/ksh +ct9jCmV3ZlDCzXmUoi+L9sCU7HD5yzQz09QtIj8QT9CppcJtarM2/l9O7D2WqgFC +Q2pjpVfTs+Vq017aLnooLEatypLiubTHfACfpBPp4V1qX4fJNTsleMvCh116L2kB +xzIEWcTbu6ObuR4coZRyx6YxkAWbW17sj+FCSzxSDWYqLjhpoWq0sndQGuKppKaa +S4Nb70hk+meU1kBggREEUpUcQOV9fCLmKu1HKLFeqBjxb2rrhAm+sdEZiQwNABlj +AT+aICi3tzSjEo9ObdtC +=eUaF -----END PGP SIGNATURE----- diff --git a/media-gfx/blender/blender-2.71-r2.ebuild b/media-gfx/blender/blender-2.71-r2.ebuild new file mode 100644 index 000000000000..c35a94bc0348 --- /dev/null +++ b/media-gfx/blender/blender-2.71-r2.ebuild @@ -0,0 +1,276 @@ +# 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/files/04-blender-2.71-r2-unbundle-glog.patch b/media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch new file mode 100644 index 000000000000..b64f60ba0b94 --- /dev/null +++ b/media-gfx/blender/files/04-blender-2.71-r2-unbundle-glog.patch @@ -0,0 +1,111 @@ +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/09-blender-2.72-unbundle-minilzo.patch b/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch new file mode 100644 index 000000000000..56563c9ded5a --- /dev/null +++ b/media-gfx/blender/files/09-blender-2.72-unbundle-minilzo.patch @@ -0,0 +1,59 @@ +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,10 +84,11 @@ + #endif + + #ifdef WITH_LZO +-#include "minilzo.h" +-#else +-/* used for non-lzo cases */ ++#include <lzo/lzo1x.h> + #define LZO_OUT_LEN(size) ((size) + (size) / 16 + 64 + 3) ++ ++#define LZO_HEAP_ALLOC(var,size) \ ++ lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ] + #endif + + #ifdef WITH_LZMA +--- 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() |