Добавлен blender 2.78c

mhiretskiy 1024
rasdark 7 years ago
parent 597eeadb0f
commit 9951b136a4

@ -1 +1,2 @@
DIST blender-2.76b.tar.gz 41728871 SHA256 bd852a8592ec2eca596a63244152506c406d8fc1d845244a8e11c84d24ad605d SHA512 6226f9709d680344fe5cd8106fafc94c33c131658971681d56df6865ae86c834fc248830c9d2c2ac0c5342bf903ada4d5b61afcdfb1ab79a06976287eeed28b9 WHIRLPOOL 606a7fb80cbcc94a53f15491ff4be16c0fc08e0f8d0d540d80426557c7918941834224387bc2f64d1aadf52ae7814f4960123a2a0175c9baa9d1131013532118
DIST blender-2.78c.tar.gz 44214415 SHA256 64a98ff30300f79385ddb9ad016aa790a92720ff2feb84ddb1d097e6531dd338 SHA512 dee09e6ac19c4eeab71d64ad9581df1bb043a3de97586206b07aeb9aa55e68ecfc3a96d39835bcec20c72fb73a5eb418b349af7abe66d906a1e660caa1e4d267 WHIRLPOOL cee72434693de4ed621d9ca37dec7645f5d823f170676a7de700918861581974689a9419c0c69038f39a8279e0698e230f33e33acbe74492814904076a51ca3c

@ -0,0 +1,295 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python3_5 )
inherit check-reqs cmake-utils fdo-mime flag-o-matic gnome2-utils \
pax-utils python-single-r1 toolchain-funcs versionator
DESCRIPTION="3D Creation/Animation/Publishing System"
HOMEPAGE="http://www.blender.org"
SRC_URI="http://download.blender.org/source/${P}.tar.gz"
# Blender can have letters in the version string,
# so strip of the letter if it exists.
MY_PV="$(get_version_component_range 1-2)"
SLOT="0"
LICENSE="|| ( GPL-2 BL )"
KEYWORDS="~amd64 ~x86"
IUSE="+boost +bullet +dds +elbeem +game-engine +openexr collada colorio \
cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
llvm man ndof nls openal openimageio openmp opensubdiv openvdb \
player sdl sndfile test tiff valgrind"
# OpenCL and nVidia performance is rubbish with Blender
# If you have nVidia, use CUDA.
REQUIRED_USE="${PYTHON_REQUIRED_USE}
player? ( game-engine !headless )
cuda? ( cycles )
cycles? ( boost openexr tiff openimageio )
colorio? ( boost )
openvdb? ( boost )
opensubdiv? ( cuda )
nls? ( boost )
openal? ( boost )
game-engine? ( boost )
?? ( ffmpeg libav )"
# Since not using OpenCL with nVidia, depend on ATI binary
# blobs as Cycles with OpenCL does not work with any open
# source drivers.
RDEPEND="${PYTHON_DEPS}
dev-libs/lzo:2
>=dev-python/numpy-1.10.1[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
media-libs/freetype
media-libs/glew:*
media-libs/libpng:0=
media-libs/libsamplerate
sys-libs/zlib
virtual/glu
virtual/jpeg:0=
virtual/libintl
virtual/opengl
boost? ( >=dev-libs/boost-1.62:=[nls?,threads(+)] )
collada? ( >=media-libs/opencollada-1.6.18:= )
colorio? ( >=media-libs/opencolorio-1.0.9-r2 )
cuda? ( =dev-util/nvidia-cuda-toolkit-8.0*:= )
ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
fftw? ( sci-libs/fftw:3.0= )
!headless? (
x11-libs/libX11
x11-libs/libXi
x11-libs/libXxf86vm
)
jack? ( media-sound/jack-audio-connection-kit )
jemalloc? ( dev-libs/jemalloc:= )
jpeg2k? ( media-libs/openjpeg:0 )
llvm? ( sys-devel/llvm )
ndof? (
app-misc/spacenavd
dev-libs/libspnav
)
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
openimageio? ( >=media-libs/openimageio-1.6.9 )
openexr? (
>=media-libs/ilmbase-2.2.0:=
>=media-libs/openexr-2.2.0:=
)
opensubdiv? ( media-libs/opensubdiv[cuda=] )
openvdb? (
media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)]
dev-cpp/tbb
>=dev-libs/c-blosc-1.5.2
)
sdl? ( media-libs/libsdl2[sound,joystick] )
sndfile? ( media-libs/libsndfile )
tiff? ( media-libs/tiff:0 )
valgrind? ( dev-util/valgrind )"
DEPEND="${RDEPEND}
>=dev-cpp/eigen-3.2.8:3
nls? ( sys-devel/gettext )
doc? (
app-doc/doxygen[-nodot(-),dot(+),latex]
dev-python/sphinx[latex]
)"
PATCHES=( "${FILESDIR}"/${PN}-fix-install-rules.patch
"${FILESDIR}"/${PN}-2.78-eigen-3.3.1.patch )
blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
if use doc; then
CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
fi
}
pkg_pretend() {
blender_check_requirements
}
pkg_setup() {
blender_check_requirements
python-single-r1_pkg_setup
}
src_prepare() {
default
# we don't want static glew, but it's scattered across
# multiple files that differ from version to version
# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
local file
while IFS="" read -d $'\0' -r file ; do
sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
done < <(find . -type f -name "CMakeLists.txt")
# Disable MS Windows help generation. The variable doesn't do what it
# it sounds like.
sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \
-i doc/doxygen/Doxyfile || die
}
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
append-cppflags -DOPENVDB_3_ABI_COMPATIBLE
local mycmakeargs=(
-DPYTHON_VERSION="${EPYTHON/python/}"
-DPYTHON_LIBRARY="$(python_get_library_path)"
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-DWITH_INSTALL_PORTABLE=OFF
-DWITH_PYTHON_INSTALL=OFF
-DWITH_PYTHON_INSTALL_NUMPY=OFF
-DWITH_STATIC_LIBS=OFF
-DWITH_SYSTEM_GLEW=ON
-DWITH_SYSTEM_OPENJPEG=ON
-DWITH_SYSTEM_EIGEN3=ON
-DWITH_SYSTEM_LZO=ON
-DWITH_C11=ON
-DWITH_CXX11=ON
-DWITH_BOOST=$(usex boost)
-DWITH_BULLET=$(usex bullet)
-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
-DWITH_CODEC_SNDFILE=$(usex sndfile)
-DWITH_CUDA=$(usex cuda)
-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
-DWITH_CYCLES=$(usex cycles)
-DWITH_CYCLES_OSL=OFF
-DWITH_LLVM=$(usex llvm)
-DWITH_FFTW3=$(usex fftw)
-DWITH_GAMEENGINE=$(usex game-engine)
-DWITH_HEADLESS=$(usex headless)
-DWITH_X11=$(usex !headless)
-DWITH_IMAGE_DDS=$(usex dds)
-DWITH_IMAGE_OPENEXR=$(usex openexr)
-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
-DWITH_IMAGE_TIFF=$(usex tiff)
-DWITH_INPUT_NDOF=$(usex ndof)
-DWITH_INTERNATIONAL=$(usex nls)
-DWITH_JACK=$(usex jack)
-DWITH_MOD_FLUID=$(usex elbeem)
-DWITH_MOD_OCEANSIM=$(usex fftw)
-DWITH_OPENAL=$(usex openal)
-DWITH_OPENCL=OFF
-DWITH_CYCLES_DEVICE_OPENCL=OFF
-DWITH_OPENCOLORIO=$(usex colorio)
-DWITH_OPENCOLLADA=$(usex collada)
-DWITH_OPENIMAGEIO=$(usex openimageio)
-DWITH_OPENMP=$(usex openmp)
-DWITH_OPENSUBDIV=$(usex opensubdiv)
-DWITH_OPENVDB=$(usex openvdb)
-DWITH_OPENVDB_BLOSC=$(usex openvdb)
-DWITH_PLAYER=$(usex player)
-DWITH_SDL=$(usex sdl)
-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-DWITH_ASSERT_ABORT=$(usex debug)
-DWITH_GTESTS=$(usex test)
-DWITH_DOC_MANPAGE=$(usex man)
-DWITH_MEM_JEMALLOC=$(usex jemalloc)
-DWITH_MEM_VALGRIND=$(usex valgrind)
)
cmake-utils_src_configure
}
src_compile() {
cmake-utils_src_compile
if use doc; then
# Workaround for binary drivers.
addpredict /dev/ati
addpredict /dev/nvidiactl
einfo "Generating Blender C/C++ API docs ..."
cd "${CMAKE_USE_DIR}"/doc/doxygen || die
doxygen -u Doxyfile || die
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 "sphinx failed."
cd "${CMAKE_USE_DIR}"/doc/python_api || die
sphinx-build sphinx-in BPY_API || die "sphinx failed."
fi
}
src_test() {
if use test; then
einfo "Running Blender Unit Tests ..."
cd "${BUILD_DIR}"/bin/tests || die
local f
for f in *_test; do
./"${f}" || die
done
fi
}
src_install() {
# Pax mark blender for hardened support.
pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender
if use doc; then
docinto "html/API/python"
dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
docinto "html/API/blender"
dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
fi
cmake-utils_src_install
# fix doc installdir
docinto "html"
dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
rm -r "${ED%/}"/usr/share/doc/blender || die
python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py"
python_optimize "${ED%/}/usr/share/blender/${MY_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 scripts."
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
ewarn ""
ewarn "You may want to remove the following directory."
ewarn "~/.config/${PN}/${MY_PV}/cache/"
ewarn "It may contain extra render kernels not tracked by portage"
ewarn ""
}

@ -0,0 +1,11 @@
diff -purN a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
--- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp 2016-09-28 10:26:55.000000000 +0100
+++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp 2016-10-04 11:13:46.489404123 +0100
@@ -34,6 +34,7 @@
#include <math.h>
#include <stdlib.h>
#include <algorithm>
+#include <cmath>
#include "rayobject_rtbuild.h"

@ -0,0 +1,25 @@
--- blender-2.78a-orig/extern/ceres/include/ceres/jet.h 2016-10-25 01:13:56.000000000 +1100
+++ blender-2.78a/extern/ceres/include/ceres/jet.h 2017-01-11 13:27:24.708241265 +1100
@@ -757,6 +757,7 @@
typedef ceres::Jet<T, N> Real;
typedef ceres::Jet<T, N> NonInteger;
typedef ceres::Jet<T, N> Nested;
+ typedef ceres::Jet<T, N> Literal;
static typename ceres::Jet<T, N> dummy_precision() {
return ceres::Jet<T, N>(1e-12);
@@ -777,6 +778,14 @@
HasFloatingPoint = 1,
RequireInitialization = 1
};
+
+ template<bool Vectorized>
+ struct Div {
+ enum {
+ AVX = false,
+ Cost = 1
+ };
+ };
};
} // namespace Eigen

@ -0,0 +1,16 @@
diff -purN a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
--- a/source/creator/CMakeLists.txt 2016-09-28 10:26:55.000000000 +0100
+++ b/source/creator/CMakeLists.txt 2016-10-03 12:17:08.938928486 +0100
@@ -328,12 +328,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...\")")
Loading…
Cancel
Save