From 7d6ff44c2b4b48220616db5cf34d22593401247e Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 21 Dec 2014 18:30:45 +0000 Subject: [PATCH] revbump, revert unbundling until it's supported upstream Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xBDEED020 --- media-gfx/blender/ChangeLog | 7 +- media-gfx/blender/Manifest | 31 +-- media-gfx/blender/blender-2.72b-r1.ebuild | 280 ++++++++++++++++++++++ 3 files changed, 302 insertions(+), 16 deletions(-) create mode 100644 media-gfx/blender/blender-2.72b-r1.ebuild diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index ad81cec345b2..454374583459 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,11 @@ # 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.279 2014/12/17 16:45:22 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.280 2014/12/21 18:30:37 hasufell Exp $ + +*blender-2.72b-r1 (21 Dec 2014) + + 21 Dec 2014; Julian Ospald +blender-2.72b-r1.ebuild: + revbump, revert unbundling until it's supported upstream 17 Dec 2014; Julian Ospald blender-2.72b.ebuild, +files/blender-2.72-T42797.diff: diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 0228d40048ef..8b651b677fd2 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -11,25 +11,26 @@ AUX 08-blender-2.71-gflags.patch 2223 SHA256 295c043088854b62da158ff6a445a8cdb01 AUX 09-blender-2.72b-unbundle-minilzo.patch 1170 SHA256 17464deac2c2536b671e16415fc3d37077727f558f8b36e1405ccf179f3c563b SHA512 d062628c837b1f4889bc9616b0814abc27c38cb1f7a77d9276846dccc12c148f22d4647d9aabb41ec342c7c52a4fad95c110869d9599c5204f803a5fb237eed2 WHIRLPOOL 69719041ebe17430fccc45875f08a64c34431c0f6f9e744d2b7d1a3b82c358a69ecbe5d8033eae63d112fcb60ffff108dc03a6b9dad7f0bbdd9c014046781dbc 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 7748 SHA256 440a5836e053fb1191e5ad092eb16bd6094bf4e744f99e27dbb3f14e881ef520 SHA512 b8ed2a3c5673b6c084a8d24b120c7a07982622fedc7211e93a612f9d62542dfffebfe636004ea2821b7af4054263721402ee304773dffe6f331901dde711b481 WHIRLPOOL 54f5c29d31542b7a542d441449d8d212c86b06a5839db7f774642b04470209f2d73c679e1179656d29d871ca5b017f8dc56b944e1d52b8b688dbbdb562bacae7 EBUILD blender-2.72b.ebuild 8116 SHA256 00d94fb5af67341b3dd7f218dbb351c6cef2e333dc1bc99af94b58231ff557e2 SHA512 5842be5a16bb893925093e203ca45892791460f2b2e0349337959b724a3df54781731c1d102384773f0f9bbf3bab86d0b21c1bd840eaaad891c5e989b8123f15 WHIRLPOOL 0e25ce96505aaf2752de86e61c62779b52c5b5e0d307dddb61b170e3f3287daec38338de0e7f1287327769b52977097ec601146e070ed48e1374e08bca04eb5c -MISC ChangeLog 50175 SHA256 0962df1255541657c70a5c59c2e7b9af6aa9818c4ea2d1c0b9a10185a57ba7b4 SHA512 46703c8a3c14b3c8a121fb9197a8d808daeba8837d762f0b9a0ac3cfa855835c6b698a38c8883fd2e7922d2e0f959edc9f6dd00d27ac2879238e8ca530a253c8 WHIRLPOOL 138b15d2c08006c518da2c201157bc5d350bf655069831432581abe71e0a2acd0c4fb83af93e2b47a2f0c3ef6dc90821df46c03dc954efd63fea7fc505d26b69 +MISC ChangeLog 50345 SHA256 29b6684303ccf07bb69ee1b08e2daa51f04b01e35236192bbfe3b595aa7ab3fe SHA512 5fc3bef69257426c0f28c7172dd05167cbd027bf1089b12d98474bf5bc47d6dba3eaf214646826cd6ae1fb9fabd73b5e9ca26083633381f171936466063de1e4 WHIRLPOOL 7e01be6f6486fc5a8b26706deafbb65c9e6fecb4a1dc69a364bbc15423a7b5e109513e77a43543fdac05faa0eb4f67b71dd6dcbbf0d19cf29adee5337152261e MISC metadata.xml 1943 SHA256 442b4b8f917e536321467f5b4408d6530fc8030db5d3efa532a007aaa81defb0 SHA512 8a18cfb1afc6e465c3e10698470794971c2b967f914332421817bbe1c6dc92372d61139803d3b5b7bdd5fd6a80c53b0eb2d0554ae8b41e5d5e4b75de30969a0c WHIRLPOOL 9ab06cf2763dbedc21723e36e9afa72710d8299f602c63152345ea3c67ea3398d8e7ac0c6b4b1c37a2767cb6598b5a76d793ab300483a052c00e6789f08f648c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJUkbMnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJUlxHSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy -MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgvvYP/1CrcSkufZlMILoGD9mVWEgb -JM/1/gziP7eHd8oxwqIeHGsS4iYdQ+p9qC3J6xTUysWypWWt54iyeymPvYBJMo4+ -YIjdKzODL4bng7Js8CkVCFgDSEE5R/zXjbdUjJ1pI1/7/yfaPrSQ8qHTWsV/8Ask -R42NBGHSA/HDj7GrrYayN5ePLbo1/3BIw4OCQpUWQwFrx/tygaJAEV6kKyuep+UX -vrD2u+efYPJdnpfWaOJjiqbWUeNiXMJt+SPzfymfTVDicgqwTIPwZ5SxgKnRihUj -BgujDrrJP6dqV6HyKwn7+TrBGYwUG5/ShwL0+RhMoDHeO707AZzxgbKPCDFn4eJB -v0dQFPYRz7hL6xdhTGRmzr1+ctxkrgaCBEiQzwYsFA+FekOn7eZKuEa2mz6b4kp7 -VwQjCob/8W00ETrdYo3H+ufsuh0TLd8IOwk5fZ2t18ZpLcWakX0+zIFEUwGW44yA -vq1Pko5Yxm57rStv7+C51wMo2a4dTDFEb+sltE9Bi0mScf2ZzVJtTWmM3FP5hCqC -dzL6dsOLDEQgtTAhwQZkI3jkZcG/q7nBOMWz9U63XO0iTX7bNW/vgX0hcLBw3uiD -fyHq+PekwV3bwNQVcKEmPnp1GbHLR30uaB22+jixJHM/DuHPLCUDySghkZ9MTjJQ -DewXt7CI3CASMW40L+pk -=vDEP +MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgv2QP/RHdf948CcBFn1x9re8BwXJI +hGt4fO2xGWazi9zdhu8bjSCs97CifO9h7zzETGoTw4kHChiWUUUfiuzVpU0BBe+H +t/tSRqqjzVKuOtIIxk/TEBQ5g5pJ9bzRcVCIKwcmG+T2jbrSIpahqTwvjzx+G9zC +djz9YyBz5IhU9XBtDjPiJBEyNCCcG3/FTplA1gXgLbn3NjDvY7L7N7aDGTTIqvLP +97lB/21m07Jn5TDVFx9d75DHPfWQfk6fM+zwspNaa/e6YPfMadGJx+JLJoPxRK5j +Z1yvPo1mc92LFLTrGDod8SkAXOHfm8hWRw9iO14wtoblYbGOyEjw0Zqlrd3NTKUh +tY+pasCRKlZ/qXhgWQ67hYVx0gkiwCOVRACY3+3CZFL0AlVp/R+AMWVMi+uK6hkl +sb+NKJ91W7fhXXV6c94p3W9ga1ONtIjQuFr2DeD0BsaozbTqn2ziM9uMGf2zmcof +owW+LZxxuXaZZ/MEyDfAhGGq04ZjCZlcqxC/SNpD5jVBBQk00k2Led1oovzNksww ++pH1EjB7NfdxhqRfpDoAmdK2ONrW06PKbl3S1uvA8rapDcE+5D2NpFn6oLHZP7J5 +3MIUYNoAdNq4XS4V7cGSIj6ebpcMHnWqNjjSrXMbiOe72IsPgN8NZM50Sd9RK3L9 +8GVy1OU8YtdvAlEtUK4E +=Nxnm -----END PGP SIGNATURE----- diff --git a/media-gfx/blender/blender-2.72b-r1.ebuild b/media-gfx/blender/blender-2.72b-r1.ebuild new file mode 100644 index 000000000000..5d1778718ce3 --- /dev/null +++ b/media-gfx/blender/blender-2.72b-r1.ebuild @@ -0,0 +1,280 @@ +# 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.1 2014/12/21 18:30:37 hasufell Exp $ + +## BUNDLED-DEPS: +# extern/cuew +# extern/Eigen3 +# extern/xdnd +# extern/carve +# extern/glew +# extern/libmv +# extern/clew +# extern/colamd +# extern/lzma +# extern/gtest +# extern/rangetree +# extern/libredcode +# extern/wcwidth +# extern/binreloc +# extern/recastnavigation +# extern/bullet2 +# extern/lzo +# extern/libopenjpeg +# extern/libmv/third_party/msinttypes +# extern/libmv/third_party/ceres +# extern/libmv/third_party/gflags +# extern/libmv/third_party/glog + +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-python/numpy[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + >=media-libs/freetype-2.0:2 + media-libs/glew + media-libs/libpng:0 + media-libs/libsamplerate + sci-libs/ldl + sys-libs/zlib + virtual/glu + virtual/jpeg + virtual/libintl + virtual/opengl + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + 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/ilmbase media-libs/openexr ) + sdl? ( media-libs/libsdl[sound,joystick] ) + sndfile? ( media-libs/libsndfile ) + tiff? ( media-libs/tiff:0 )" +DEPEND="${RDEPEND} + 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}"/${PN}-2.68-doxyfile.patch \ + "${FILESDIR}"/${PN}-2.68-fix-install-rules.patch \ + "${FILESDIR}"/${PN}-2.70-sse2.patch + + epatch_user + + # 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 + + # 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 + ewarn + ewarn "This ebuild does not unbundle the massive amount of 3rd party" + ewarn "libraries which are shipped with blender. Note that" + ewarn "these have caused security issues in the past." + ewarn "If you are concerned about security, file a bug upstream:" + ewarn " https://developer.blender.org/" + ewarn + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} + -- 2.26.2