commit:     389974bf3e4782981a079f008dd2241f7ec6a07f
Author:     Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au>
AuthorDate: Wed Sep 30 22:46:09 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 02:13:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=389974bf

media-gfx/blender: Version bump to blender 2.90.1

Update from blender 2.83.4 to 2.90.1

Only two changes were required from 2.83.4

Add -DWITH_CYCLES_EMBREE=OFF until Embree has been packaged for Gentoo
(thanks to Oleg)

Rename WITH_X11 to WITH_GHOST_X11 as per upstream

Signed-off-by: Adrian Grigo <agrigo2001 <AT> yahoo.com.au>
Closes: https://bugs.gentoo.org/741126
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Closes: https://github.com/gentoo/gentoo/pull/17723
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/blender/Manifest              |   1 +
 media-gfx/blender/blender-2.90.1.ebuild | 319 ++++++++++++++++++++++++++++++++
 2 files changed, 320 insertions(+)

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index cbe57e4eec0..6ac6b01289b 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,2 +1,3 @@
 DIST blender-2.79b.tar.gz 50204270 BLAKE2B 
78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0
 SHA512 
2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f
 DIST blender-2.83.4.tar.xz 38528352 BLAKE2B 
54596207cbee34fcaa6b81a0d829976b42c28c793b88de81d78c1c3fdfe9dd2a0189a314be281b2a0f1829a0b7fd30d37bceaa28d35c9794dcb0f009fa71e83d
 SHA512 
061735273159742784ed210d13fb39ad076efbbfd5f0291bab1b983699d43b20462dc7e4795e28dab0cd191c9879b43d9ad0f0545c24ef5da23c74679e5ccab5
+DIST blender-2.90.1.tar.xz 38836408 BLAKE2B 
42622e742ebd397dc035c85cf26ab72ffee64f2cd46f1523de78dc8861bc19286a7d87b9e31a0d6afdf9a931da7018ccbdb9b4185b8535b4529656c6d85efc34
 SHA512 
e7d6f8df598f2a2a99f64716331ec4e981a5a49c76b307caf7856480c778455cfc4bbb56fbedc8b22d1e10951ebaeb6844d1ead9476847bf2824dddf5b135992

diff --git a/media-gfx/blender/blender-2.90.1.ebuild 
b/media-gfx/blender/blender-2.90.1.ebuild
new file mode 100644
index 00000000000..4c25969a1ec
--- /dev/null
+++ b/media-gfx/blender/blender-2.90.1.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+       toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org";
+
+SRC_URI="https://download.blender.org/source/${P}.tar.xz";
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+       abi6-compat abi7-compat alembic collada color-management cuda cycles \
+       debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+       man ndof nls openal opencl openimageio openmp opensubdiv \
+       openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+       alembic? ( openexr )
+       cuda? ( cycles )
+       cycles? ( openexr tiff openimageio )
+       elbeem? ( tbb )
+       opencl? ( cycles )
+       openvdb? (
+               ^^ ( abi6-compat abi7-compat )
+               tbb
+       )
+       osl? ( cycles llvm )
+       standalone? ( cycles )"
+
+RDEPEND="${PYTHON_DEPS}
+       dev-libs/boost:=[nls?,threads(+)]
+       dev-libs/lzo:2=
+       $(python_gen_cond_dep '
+               dev-python/numpy[${PYTHON_USEDEP}]
+               dev-python/requests[${PYTHON_USEDEP}]
+       ')
+       media-libs/freetype:=
+       media-libs/glew:*
+       media-libs/libpng:=
+       media-libs/libsamplerate
+       sys-libs/zlib:=
+       virtual/glu
+       virtual/jpeg
+       virtual/libintl
+       virtual/opengl
+       alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+       collada? ( >=media-libs/opencollada-1.6.68 )
+       color-management? ( media-libs/opencolorio )
+       cuda? ( dev-util/nvidia-cuda-toolkit:= )
+       ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+       fftw? ( sci-libs/fftw:3.0= )
+       !headless? (
+               x11-libs/libX11
+               x11-libs/libXi
+               x11-libs/libXxf86vm
+       )
+       jack? ( virtual/jack )
+       jemalloc? ( dev-libs/jemalloc:= )
+       jpeg2k? ( media-libs/openjpeg:2= )
+       llvm? ( sys-devel/llvm:= )
+       ndof? (
+               app-misc/spacenavd
+               dev-libs/libspnav
+       )
+       nls? ( virtual/libiconv )
+       openal? ( media-libs/openal )
+       opencl? ( virtual/opencl )
+       openimageio? ( media-libs/openimageio )
+       openexr? (
+               media-libs/ilmbase:=
+               media-libs/openexr:=
+       )
+       opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+       openvdb? (
+               ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+               dev-libs/c-blosc:=
+       )
+       osl? ( media-libs/osl )
+       sdl? ( media-libs/libsdl2[sound,joystick] )
+       sndfile? ( media-libs/libsndfile )
+       tbb? ( dev-cpp/tbb )
+       tiff? ( media-libs/tiff )
+       valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+       dev-cpp/eigen:=
+"
+
+BDEPEND="
+       virtual/pkgconfig
+       doc? (
+               app-doc/doxygen[dot]
+               dev-python/sphinx[latex]
+               dev-texlive/texlive-bibtexextra
+               dev-texlive/texlive-fontsextra
+               dev-texlive/texlive-fontutils
+               dev-texlive/texlive-latex
+               dev-texlive/texlive-latexextra
+       )
+       nls? ( sys-devel/gettext )
+"
+
+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() {
+       cmake_src_prepare
+
+       # 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
+
+       if use openvdb; then
+               local version
+               if use abi6-compat; then
+                       version=6;
+               elif use abi7-compat; then
+                       version=7;
+               else
+                       die "Openvdb abi version not compatible"
+               fi
+               append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
+       fi
+
+       local mycmakeargs=(
+               -DBUILD_SHARED_LIBS=OFF
+               -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+               -DPYTHON_LIBRARY="$(python_get_library_path)"
+               -DPYTHON_VERSION="${EPYTHON/python/}"
+               -DWITH_ALEMBIC=$(usex alembic)
+               -DWITH_ASSERT_ABORT=$(usex debug)
+               -DWITH_BOOST=ON
+               -DWITH_BULLET=$(usex bullet)
+               -DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+               -DWITH_CODEC_SNDFILE=$(usex sndfile)
+               -DWITH_CXX_GUARDEDALLOC=$(usex debug)
+               -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+               -DWITH_CYCLES=$(usex cycles)
+               -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+               -DWITH_CYCLES_EMBREE=OFF
+               -DWITH_CYCLES_STANDALONE=$(usex standalone)
+               -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+               -DWITH_CYCLES_OSL=$(usex osl)
+               -DWITH_DOC_MANPAGE=$(usex man)
+               -DWITH_FFTW3=$(usex fftw)
+               -DWITH_GHOST_X11=$(usex !headless)
+               -DWITH_GTESTS=$(usex test)
+               -DWITH_HEADLESS=$(usex headless)
+               -DWITH_INSTALL_PORTABLE=OFF
+               -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_LLVM=$(usex llvm)
+               -DWITH_MEM_JEMALLOC=$(usex jemalloc)
+               -DWITH_MEM_VALGRIND=$(usex valgrind)
+               -DWITH_MOD_FLUID=$(usex elbeem)
+               -DWITH_MOD_OCEANSIM=$(usex fftw)
+               -DWITH_OPENAL=$(usex openal)
+               -DWITH_OPENCOLLADA=$(usex collada)
+               -DWITH_OPENCOLORIO=$(usex color-management)
+               -DWITH_OPENIMAGEIO=$(usex openimageio)
+               -DWITH_OPENMP=$(usex openmp)
+               -DWITH_OPENSUBDIV=$(usex opensubdiv)
+               -DWITH_OPENVDB=$(usex openvdb)
+               -DWITH_OPENVDB_BLOSC=$(usex openvdb)
+               -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+               -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+               -DWITH_SDL=$(usex sdl)
+               -DWITH_STATIC_LIBS=OFF
+               -DWITH_SYSTEM_EIGEN3=ON
+               -DWITH_SYSTEM_GLEW=ON
+               -DWITH_SYSTEM_LZO=ON
+               -DWITH_TBB=$(usex tbb)
+       )
+       cmake_src_configure
+}
+
+src_compile() {
+       cmake_src_compile
+
+       if use doc; then
+               # Workaround for binary drivers.
+               addpredict /dev/ati
+               addpredict /dev/dri
+               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 "${BUILD_DIR}"/bin/blender
+
+       if use standalone; then
+               dobin "${BUILD_DIR}"/bin/cycles
+       fi
+
+       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_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_postinst() {
+       elog
+       elog "Blender uses python integration. As such, may have some"
+       elog "inherent 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
+       xdg_icon_cache_update
+       xdg_mimeinfo_database_update
+       xdg_desktop_database_update
+}
+
+pkg_postrm() {
+       xdg_icon_cache_update
+       xdg_mimeinfo_database_update
+       xdg_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 ""
+}

Reply via email to