diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-07 00:16:33 +0100 |
commit | d162ba1860a88062f4cd61f8b52fc303ba0b2991 (patch) | |
tree | 24cd2cf57f3932a24b96e4a0f6666489447e43ba /media-gfx/blender | |
parent | 590b9b7b03bf4651e099949e318755af7cfa81b8 (diff) |
gentoo resync : 07.08.2021
Diffstat (limited to 'media-gfx/blender')
-rw-r--r-- | media-gfx/blender/Manifest | 12 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.83.15.ebuild | 20 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.83.16.ebuild | 380 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.93.0.ebuild | 20 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.93.1.ebuild | 390 | ||||
-rw-r--r-- | media-gfx/blender/blender-9999.ebuild | 13 | ||||
-rw-r--r-- | media-gfx/blender/metadata.xml | 6 |
7 files changed, 818 insertions, 23 deletions
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 39840073e9da..29d8978e6735 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -4,9 +4,13 @@ AUX blender-2.83.6-fix_opevdb_abi.patch 587 BLAKE2B 90f22c522f2626442b68e2cb89e6 AUX blender-2.83.6-libmv_eigen_alignment.patch 6777 BLAKE2B 5a7cc33dc599a58f15fcda2110d1c7be9dd3bab4427f5f0ab09a5645248e4585b4e183dcd38e5a39b0827a8ef529e74e59126bc7dcecf2c208b428b5ad264e26 SHA512 8b52ab1bdeaa585b2211aa4b3e9e9c2384867e4011ac20cc1fa712b3c8823c5f42359d5728a094e509a7f40cc166f308cd020da1d35f9e2b0bc20e7bb7e5a461 DIST blender-2.83.1-tests.tar.bz2 266633785 BLAKE2B 8d8102c3107480de95dfd9ef9dabba1cd82893aad553af2ff5ef1afadc831dc5ccf5553c41466511ecb2a1435bc79c936ad64a78bdd4375e3e30af85b69807c6 SHA512 3ffba6fa8401bba3e2bdbccf7067761114d516371c7778a2f6604a243fd8610e26a30b88a32728c26f7e6274182d298752f32b5e76abf8216be0ec4b3ce38cd9 DIST blender-2.83.15.tar.xz 39125740 BLAKE2B 687097b45b76b474b1c172c9b8ccf5da1bfc24539d0db894d04c7837572b16c1f552757fd1482219d58afa56c573229878fb43bbecd95e3d61314f2ab05efafa SHA512 2836533691bae0a7942197e67232b396b892cd95c0f07ab561f7de8458b354fe4045453855585484dd533ae76588ea3888f880763b042a264fb813a43933fc25 +DIST blender-2.83.16.tar.xz 39135184 BLAKE2B 2515822373f6a9343c760ad656de732094ee58a9354423e0f3d7bf1042220fc54af7e1d9f5b59a170a23e8b1b57a4b7f09867a000a57a6e4e820ff5c6cdd47b6 SHA512 ef78278387ae981972942ee4724abcb11ca19da2b88a3c8bbe1e9aafb93f28d84d4c79d01542e11218bd58bfec80fcfdbffdfd28896d146edd34181a7439dbd5 DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513 SHA512 0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe DIST blender-2.93.0.tar.xz 42967016 BLAKE2B 1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3 SHA512 660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d -EBUILD blender-2.83.15.ebuild 11453 BLAKE2B e95cfea18c8cf7ca90bc3608fca0b279f595d44bb15f22347cde1c4ce5fd0eee63247fdc0b4455b245981c1140f9a1097faf991e5b331c94f6d1958353340d6b SHA512 6bacb4102f897590c214436dd6fe1625abd8ef8ebfa445cdb13d90ea91d8a8626ef7853f587f58a7385f20e24c06ab1238b39956ccb16baf9b0f2bff224d5705 -EBUILD blender-2.93.0.ebuild 11609 BLAKE2B c0f39d9ebabef9ac788d3e8ae5303b90048b17d4b32b5f49e9cadbac66ff8ff127d669049246f78c44966ccaadcf4c90583ad7b917f95367902f551b270c5879 SHA512 071cafc9d4f3ff0548de6f1ece1bfd7ef2ad6fc736eeec5d1a8ca27efaa650225d3b46c7ce39e7daa2ad8e9e6eb9d79c20595aa60dcaf20bdfe19b1fd59427da -EBUILD blender-9999.ebuild 11663 BLAKE2B 4402772729d606cdb63eb468c9d06235b8ab00f75ca8e465f7501e14d620cc375d890beafdc953b2d269741ae89f16a4185a2d5e42b3950c0da23b61d5f21b2a SHA512 09cafd404aec69c9bbcbc8527e3ef1b3c3eac9ed45a65348ae584f512b517e3bfc4be3fe7d571002955d071fa84d0a6c435026fa17738ac81b15ed7335bfb681 -MISC metadata.xml 2959 BLAKE2B 943ad3fcee54211bbf5a18bfe52229820559b16728a3bc162d55dbf9c142970e918355b68bef7e894115cb1c8ff8f3e0cc0be0dfaa0102667d9c93f43bd32963 SHA512 a1c334bdc815bb1459adc5c2fe55b445f1dd6d92a860d53f06c93f22ca10bf62e4b6e8f6eab9b1221b0e239675a2782e11aa4da977d33fd5ee9da1ac2af351d5 +DIST blender-2.93.1.tar.xz 42960100 BLAKE2B eda0a8c0414d1f7c89d21e34ba238b0cbe337ea755d6f10792e7c3bd5e15934184d3bd853ed636764776095ce1e3f081d63386b7c13fb7ac666580bf9eeb43c8 SHA512 b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1 +EBUILD blender-2.83.15.ebuild 11648 BLAKE2B b2cc50214b9430bb0692978eb3e6d593b50902047201c085154e6b821300f139b6c06979adc8cccdafb2b2ab7e1a8c852fbbd57c69b12ad2d3e743676a1662ad SHA512 df5e0e10f6f43d80f1fe9e1e4aaf6ded4fcc3f70d283c962ff6f340adfe36c43db00499555a8fd4990197bdb115bb47ac3e1231b4567cc86375724a1c71c220d +EBUILD blender-2.83.16.ebuild 11648 BLAKE2B b2cc50214b9430bb0692978eb3e6d593b50902047201c085154e6b821300f139b6c06979adc8cccdafb2b2ab7e1a8c852fbbd57c69b12ad2d3e743676a1662ad SHA512 df5e0e10f6f43d80f1fe9e1e4aaf6ded4fcc3f70d283c962ff6f340adfe36c43db00499555a8fd4990197bdb115bb47ac3e1231b4567cc86375724a1c71c220d +EBUILD blender-2.93.0.ebuild 11804 BLAKE2B 18040f539463ff3e853f998bb2ae0c5597b1b1181765c9d29ac84ba0f0f0b0d29ec39559c2c6cac44a17b43b1644aeef394f3dfa4f3d38f49071d9602dd6fcdd SHA512 2aa637e5833c7d9081aedd75cda876a40280e4c0071cbed07b1c66ef0d1f0c9489a4c52eae64429049d52460bf09951fe16839597a6dc59580764562ea5b1cf0 +EBUILD blender-2.93.1.ebuild 11804 BLAKE2B 18040f539463ff3e853f998bb2ae0c5597b1b1181765c9d29ac84ba0f0f0b0d29ec39559c2c6cac44a17b43b1644aeef394f3dfa4f3d38f49071d9602dd6fcdd SHA512 2aa637e5833c7d9081aedd75cda876a40280e4c0071cbed07b1c66ef0d1f0c9489a4c52eae64429049d52460bf09951fe16839597a6dc59580764562ea5b1cf0 +EBUILD blender-9999.ebuild 11795 BLAKE2B 1d72da32cd5ffbf4f79bb0a54a532a45d8a15ed72a26521aab7d9ee08818d28676537d0252ff12afc566be194dfcfe881f40611ef5a72b52e83c319c17484962 SHA512 db9cd23d97310bfdb2d48040896da916ce7df418fa1e2666e9917cf6c00e752a0aa9a16306200ad78cc242ffa0f4aaccc369df61bece896533c4072159d4fadc +MISC metadata.xml 3162 BLAKE2B d414c213587d6c831a64931151eae8998c9ea93a20f1bda916e9b3caa041b90857865952b8b47c2a1999659f00a1fbf5ad4ae56e77cb5905bc7fbadd6d656744 SHA512 6b8abc0bdbd41e518d810d96780b2f11fd2e0d72db7642d17299254ea7d5af3cd7c59c4c2e78c9ff2eb89fed66bf7c03ed67bee4ea40569159b10c488251fa84 diff --git a/media-gfx/blender/blender-2.83.15.ebuild b/media-gfx/blender/blender-2.83.15.ebuild index ccb67825bbd5..f7382f1c719e 100644 --- a/media-gfx/blender/blender-2.83.15.ebuild +++ b/media-gfx/blender/blender-2.83.15.ebuild @@ -15,7 +15,8 @@ if [[ ${PV} = *9999* ]] ; then EGIT_REPO_URI="https://git.blender.org/blender.git" else SRC_URI="https://download.blender.org/source/${P}.tar.xz" - SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.83.1-tests.tar.bz2 )" + TEST_TARBALL_VERSION=2.83.1 + SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )" KEYWORDS="~amd64 ~x86" fi @@ -153,8 +154,8 @@ src_unpack() { fi if use test; then - mkdir -p lib/tests || die - mv "${WORKDIR}"/blender*tests* lib/tests || die + mkdir -p lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die fi } @@ -320,15 +321,20 @@ src_install() { cmake_src_install - # fix doc installdir - docinto "html" + if use man; then + # Slot the man page + mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die + fi + + # 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-${BV}-thumbnailer.py" python_optimize "${ED}/usr/share/blender/${BV}/scripts" - mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" + mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die } pkg_postinst() { @@ -368,7 +374,7 @@ pkg_postrm() { ewarn "" ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/<blender version>/cache/" + ewarn "~/.config/${PN}/${SLOT}/cache/" ewarn "It may contain extra render kernels not tracked by portage" ewarn "" } diff --git a/media-gfx/blender/blender-2.83.16.ebuild b/media-gfx/blender/blender-2.83.16.ebuild new file mode 100644 index 000000000000..f7382f1c719e --- /dev/null +++ b/media-gfx/blender/blender-2.83.16.ebuild @@ -0,0 +1,380 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +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" + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.blender.org/blender.git" +else + SRC_URI="https://download.blender.org/source/${P}.tar.xz" + TEST_TARBALL_VERSION=2.83.1 + SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )" + KEYWORDS="~amd64 ~x86" +fi + +SLOT="${PV%.*}" +LICENSE="|| ( GPL-3 BL )" +IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ + alembic collada +color-management cuda cycles \ + debug doc ffmpeg fftw headless jack jemalloc jpeg2k \ + 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 ) + fluid? ( tbb ) + opencl? ( cycles ) + openvdb? ( tbb ) + osl? ( cycles ) + standalone? ( cycles ) + test? ( color-management osl )" + +# Library versions for official builds can be found in the blender source directory in: +# build_files/build_environment/install_deps.sh +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-2.0.0 ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] ) + 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= ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( media-libs/openal ) + opencl? ( virtual/opencl ) + openimageio? ( >=media-libs/openimageio-2.2.13.1:= ) + openexr? ( + media-libs/ilmbase:= + media-libs/openexr:= + ) + opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) + openvdb? ( + >=media-gfx/openvdb-7.0.0 + dev-libs/c-blosc:= + ) + osl? ( <media-libs/osl-1.11.0 ) + 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 ) +" + +PATCHES=( + "${FILESDIR}/blender-2.83.6-libmv_eigen_alignment.patch" + "${FILESDIR}/blender-2.83.6-constraints_test.patch" + "${FILESDIR}/blender-2.83.6-fix_opevdb_abi.patch" + "${FILESDIR}/blender-2.83.13-ffmpeg-4_4.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 +} + +blender_get_version() { + # Get blender version from blender itself. + BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert) + # Add period. + BV=${BV:0:1}.${BV:1} +} + +pkg_pretend() { + blender_check_requirements +} + +pkg_setup() { + blender_check_requirements + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} = *9999* ]] ; then + git-r3_src_unpack + else + default + fi + + if use test; then + mkdir -p lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die + fi +} + +src_prepare() { + cmake_src_prepare + + blender_get_version + + # 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 + + # Prepare icons and .desktop files for slotting. + sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -i source/creator/CMakeLists.txt || die + + sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die + sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die + sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die + + mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die + mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die + mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die + mv release/bin/blender-thumbnailer.py release/bin/blender-${BV}-thumbnailer.py || die + + if use test; then + # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. + sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die + sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die + fi +} + +src_configure() { + # Without this the floating point math will differ when for example + # "-march=native" is set. This will make automated tests fail and we will + # not match the behaviour of some operators/modifiers with the official + # builds. + append-flags -ffp-contract=off + append-lfs-flags + + 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_STANDALONE=$(usex standalone) + -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) + -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_DOC_MANPAGE=$(usex man) + -DWITH_FFTW3=$(usex fftw) + -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_MEM_JEMALLOC=$(usex jemalloc) + -DWITH_MEM_VALGRIND=$(usex valgrind) + -DWITH_MOD_FLUID=$(usex fluid) + -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) + -DWITH_USD=OFF + ) + if ! use debug ; then + append-flags -DNDEBUG + else + append-flags -DDEBUG + fi + 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() { + # A lot of tests needs to have access to the installed data files. + # So install them into the image directory now. + cmake_src_install + + blender_get_version + # Define custom blender data/script file paths not be able to find them otherwise during testing. + # (Because the data is in the image directory and it will default to look in /usr/share) + export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts + export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles + + # NOTE: The 'modifiers' test will fail if opensubdiv was compiled with -march=native + # This this is fixed in blender version 2.92 and up." + cmake_src_test + + # Clean up the image directory for src_install + rm -fr ${ED}/* || die +} + +src_install() { + blender_get_version + + # 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 + + if use man; then + # Slot the man page + mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die + fi + + # 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-${BV}-thumbnailer.py" + python_optimize "${ED}/usr/share/blender/${BV}/scripts" + + mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die +} + +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 "changing the 'Temporary Files' directory in Blender preferences." + 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 + + elog "You are building Blender with a newer python version than" + elog "supported by this version upstream." + elog "If you experience breakages with e.g. plugins, please download" + elog "the official Blender LTS binary release instead." + elog "Bug: https://bugs.gentoo.org/737388" + elog + + 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}/${SLOT}/cache/" + ewarn "It may contain extra render kernels not tracked by portage" + ewarn "" +} diff --git a/media-gfx/blender/blender-2.93.0.ebuild b/media-gfx/blender/blender-2.93.0.ebuild index 8a23be813239..56fe343c940d 100644 --- a/media-gfx/blender/blender-2.93.0.ebuild +++ b/media-gfx/blender/blender-2.93.0.ebuild @@ -15,7 +15,8 @@ if [[ ${PV} = *9999* ]] ; then EGIT_REPO_URI="https://git.blender.org/blender.git" else SRC_URI="https://download.blender.org/source/${P}.tar.xz" - SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.93.0-tests.tar.bz2 )" + TEST_TARBALL_VERSION=2.93.0 + SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )" KEYWORDS="~amd64" fi @@ -159,8 +160,8 @@ src_unpack() { fi if use test; then - mkdir -p lib/tests || die - mv "${WORKDIR}"/blender*tests* lib/tests || die + mkdir -p lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die fi } @@ -328,15 +329,20 @@ src_install() { cmake_src_install - # fix doc installdir - docinto "html" + if use man; then + # Slot the man page + mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die + fi + + # 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-${BV}-thumbnailer.py" python_optimize "${ED}/usr/share/blender/${BV}/scripts" - mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" + mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die } pkg_postinst() { @@ -378,7 +384,7 @@ pkg_postrm() { ewarn "" ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/<blender version>/cache/" + ewarn "~/.config/${PN}/${SLOT}/cache/" ewarn "It may contain extra render kernels not tracked by portage" ewarn "" } diff --git a/media-gfx/blender/blender-2.93.1.ebuild b/media-gfx/blender/blender-2.93.1.ebuild new file mode 100644 index 000000000000..56fe343c940d --- /dev/null +++ b/media-gfx/blender/blender-2.93.1.ebuild @@ -0,0 +1,390 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_9 ) + +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" + +if [[ ${PV} = *9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.blender.org/blender.git" +else + SRC_URI="https://download.blender.org/source/${P}.tar.xz" + TEST_TARBALL_VERSION=2.93.0 + SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2 )" + KEYWORDS="~amd64" +fi + +SLOT="${PV%.*}" +LICENSE="|| ( GPL-3 BL )" +IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \ + alembic collada +color-management cuda +cycles \ + debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ + man ndof nls openal opencl +oidn +openimageio +openmp +opensubdiv \ + +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile standalone test +tiff valgrind" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + alembic? ( openexr ) + cuda? ( cycles ) + cycles? ( openexr tiff openimageio ) + fluid? ( tbb ) + opencl? ( cycles ) + openvdb? ( tbb ) + osl? ( cycles ) + standalone? ( cycles ) + test? ( color-management )" + +# Library versions for official builds can be found in the blender source directory in: +# build_files/build_environment/install_deps.sh +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-2.0.0 ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + embree? ( >=media-libs/embree-3.10.0[raymask] ) + ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] ) + fftw? ( sci-libs/fftw:3.0= ) + gmp? ( dev-libs/gmp ) + !headless? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc:= ) + jpeg2k? ( media-libs/openjpeg:2= ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( media-libs/openal ) + opencl? ( virtual/opencl ) + oidn? ( >=media-libs/oidn-1.3.0 ) + openimageio? ( >=media-libs/openimageio-2.2.13.1:= ) + openexr? ( + media-libs/ilmbase:= + media-libs/openexr:= + ) + opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) + openvdb? ( + >=media-gfx/openvdb-7.1.0 + dev-libs/c-blosc:= + ) + osl? ( >=media-libs/osl-1.11.10.0 ) + pdf? ( media-libs/libharu ) + potrace? ( media-gfx/potrace ) + pugixml? ( dev-libs/pugixml ) + pulseaudio? ( media-sound/pulseaudio ) + sdl? ( media-libs/libsdl2[sound,joystick] ) + sndfile? ( media-libs/libsndfile ) + tbb? ( dev-cpp/tbb ) + test? ( dev-vcs/subversion ) + 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 +} + +blender_get_version() { + # Get blender version from blender itself. + BV=$(grep "BLENDER_VERSION " source/blender/blenkernel/BKE_blender_version.h | cut -d " " -f 3; assert) + if ((${BV:0:1} < 3)) ; then + # Add period (290 -> 2.90). + BV=${BV:0:1}.${BV:1} + else + # Add period and strip last number (300 -> 3.0) + BV=${BV:0:1}.${BV:1:1} + fi +} + +pkg_pretend() { + blender_check_requirements +} + +pkg_setup() { + blender_check_requirements + python-single-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} = *9999* ]] ; then + git-r3_src_unpack + else + default + fi + + if use test; then + mkdir -p lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die + fi +} + +src_prepare() { + cmake_src_prepare + + blender_get_version + + # 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 + + # Prepare icons and .desktop files for slotting. + sed -e "s|blender.svg|blender-${BV}.svg|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender-symbolic.svg|blender-${BV}-symbolic.svg|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender.desktop|blender-${BV}.desktop|" -i source/creator/CMakeLists.txt || die + sed -e "s|blender-thumbnailer.py|blender-${BV}-thumbnailer.py|" -i source/creator/CMakeLists.txt || die + + sed -e "s|Name=Blender|Name=Blender ${PV}|" -i release/freedesktop/blender.desktop || die + sed -e "s|Exec=blender|Exec=blender-${BV}|" -i release/freedesktop/blender.desktop || die + sed -e "s|Icon=blender|Icon=blender-${BV}|" -i release/freedesktop/blender.desktop || die + + mv release/freedesktop/icons/scalable/apps/blender.svg release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die + mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die + mv release/freedesktop/blender.desktop release/freedesktop/blender-${BV}.desktop || die + mv release/bin/blender-thumbnailer.py release/bin/blender-${BV}-thumbnailer.py || die + + if use test; then + # Without this the tests will try to use /usr/bin/blender and /usr/share/blender/ to run the tests. + sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i tests/CMakeLists.txt || die + sed -e "s|string(REPLACE.*|set(TEST_INSTALL_DIR ${ED}/usr/)|g" -i build_files/cmake/Modules/GTestTesting.cmake || die + fi +} + +src_configure() { + append-lfs-flags + + 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=$(usex cycles) + -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) + -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) + -DWITH_CYCLES_EMBREE=$(usex embree) + -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_CYCLES_STANDALONE=$(usex standalone) + -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) + -DWITH_DOC_MANPAGE=$(usex man) + -DWITH_FFTW3=$(usex fftw) + -DWITH_GMP=$(usex gmp) + -DWITH_GTESTS=$(usex test) + -DWITH_HARU=$(usex pdf) + -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_MEM_JEMALLOC=$(usex jemalloc) + -DWITH_MEM_VALGRIND=$(usex valgrind) + -DWITH_MOD_FLUID=$(usex fluid) + -DWITH_MOD_OCEANSIM=$(usex fftw) + -DWITH_NANOVDB=OFF + -DWITH_OPENAL=$(usex openal) + -DWITH_OPENCOLLADA=$(usex collada) + -DWITH_OPENCOLORIO=$(usex color-management) + -DWITH_OPENIMAGEDENOISE=$(usex oidn) + -DWITH_OPENIMAGEIO=$(usex openimageio) + -DWITH_OPENMP=$(usex openmp) + -DWITH_OPENSUBDIV=$(usex opensubdiv) + -DWITH_OPENVDB=$(usex openvdb) + -DWITH_OPENVDB_BLOSC=$(usex openvdb) + -DWITH_POTRACE=$(usex potrace) + -DWITH_PUGIXML=$(usex pugixml) + -DWITH_PULSEAUDIO=$(usex pulseaudio) + -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) + -DWITH_USD=OFF + -DWITH_XR_OPENXR=OFF + ) + if ! use debug ; then + append-flags -DNDEBUG + else + append-flags -DDEBUG + fi + 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() { + # A lot of tests needs to have access to the installed data files. + # So install them into the image directory now. + cmake_src_install + + blender_get_version + # Define custom blender data/script file paths not be able to find them otherwise during testing. + # (Because the data is in the image directory and it will default to look in /usr/share) + export BLENDER_SYSTEM_SCRIPTS=${ED}/usr/share/blender/${BV}/scripts + export BLENDER_SYSTEM_DATAFILES=${ED}/usr/share/blender/${BV}/datafiles + + cmake_src_test + + # Clean up the image directory for src_install + rm -fr ${ED}/* || die +} + +src_install() { + blender_get_version + + # 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 + + if use man; then + # Slot the man page + mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die + fi + + # 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-${BV}-thumbnailer.py" + python_optimize "${ED}/usr/share/blender/${BV}/scripts" + + mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die +} + +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 "changing the 'Temporary Files' directory in Blender preferences." + 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 + + if ! use python_single_target_python3_9; then + elog "You are building Blender with a newer python version than" + elog "supported by this version upstream." + elog "If you experience breakages with e.g. plugins, please switch to" + elog "python_single_target_python3_9 instead." + elog "Bug: https://bugs.gentoo.org/737388" + elog + fi + + 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}/${SLOT}/cache/" + ewarn "It may contain extra render kernels not tracked by portage" + ewarn "" +} diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index 801ddf0af3a3..7b72a280eb4b 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -328,15 +328,20 @@ src_install() { cmake_src_install - # fix doc installdir - docinto "html" + if use man; then + # Slot the man page + mv "${ED}/usr/share/man/man1/blender.1" "${ED}/usr/share/man/man1/blender-${BV}.1" || die + fi + + # 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-${BV}-thumbnailer.py" python_optimize "${ED}/usr/share/blender/${BV}/scripts" - mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" + mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die } pkg_postinst() { @@ -378,7 +383,7 @@ pkg_postrm() { ewarn "" ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/<blender version>/cache/" + ewarn "~/.config/${PN}/${SLOT}/cache/" ewarn "It may contain extra render kernels not tracked by portage" ewarn "" } diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index 16d447e56348..88115ad6aa1c 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -5,6 +5,10 @@ <email>agrigo2001@yahoo.com.au</email> <name>Adrian Grigo</name> </maintainer> + <maintainer type="person" proxied="yes"> + <email>darkdefende@gmail.com</email> + <name>Sebastian Parborg</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> @@ -58,7 +62,7 @@ through <pkg>media-libs/opensubdiv</pkg>. </flag> <flag name="openvdb"> - Add GPU preview rendering. Only works with nVidia cards. + Enable openvdb for volumetric processing, like the voxel remesher. Also enables volumetric GPU preview rendering for Nvidia cards. </flag> <flag name="osl"> Add support for OpenShadingLanguage scripting. |