From 73c318acdaf6f8309d68bd266051e6dd1f1bd787 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Jun 2019 09:04:53 +0100 Subject: gentoo resync : 08.06.2019 --- media-gfx/blender/Manifest | 4 - media-gfx/blender/blender-2.79-r1.ebuild | 290 --------------------- media-gfx/blender/blender-2.79.ebuild | 287 -------------------- .../blender-2.79-fix-build-with-OSL-1.9.x.patch | 26 -- 4 files changed, 607 deletions(-) delete mode 100644 media-gfx/blender/blender-2.79-r1.ebuild delete mode 100644 media-gfx/blender/blender-2.79.ebuild delete mode 100644 media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch (limited to 'media-gfx/blender') diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 36ed0c13b794..7dcd6f304e21 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,10 +1,6 @@ -AUX blender-2.79-fix-build-with-OSL-1.9.x.patch 1119 BLAKE2B f0289707d5383ee11af257b7d77a725e83aba3c086c12a4a2fb390bb5e02a27c4f3376083ddfd827e3ff3ca24212df4ea463062c6bea524aaee373847837986e SHA512 0a02efdcc6710d34e57ff99ff5c999cebeb7cf130fba76fa82ba29f0827ee63c97448eb01aa10982096d22b61fbc1751be5e1fe3154792e266b0c9dd04c54f42 AUX blender-2.79b-ffmpeg-4-compat.patch 2052 BLAKE2B 3e9f341416a3dc629d950623cc54da4c2984c7f73b6565cb7cb0aa00bf86eec725f0fdc503a517b29282596669de108d1dbe2c9783c8a0da412a6d14834d5cdf SHA512 afd90ee52a2a7d955417450e92642e2169c1f0e6d20d96a1f08521db718bc224941c15d23152eb3fcde1b4dc84ffb52162d77b23252ef8250a6b5ddbcd8ca67d AUX blender-2.79b-gcc-8.patch 1259 BLAKE2B 7d204a953c71e656fb309e0560e2de03a9316a95e67a76ecdeb303fadeeca14338ba823d6780a50b62bf4686477a962030b42b15ceae12d48ab21034b0358cc1 SHA512 df0a6a0543a7feac22e6082652792e59ce675dcea99a821c480d5c13e42e9df4d7ab43c71d296a22dd195771714e630757b1e220177d3713f409ea21e9251504 AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec -DIST blender-2.79.tar.gz 50145270 BLAKE2B 5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338 SHA512 9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f -EBUILD blender-2.79-r1.ebuild 8100 BLAKE2B 7c077c8d3847fa0d7b881b5f5989e42339574b7104bc78869c8e481073b1e6ca062e5a74233f0b96b9ff6b1390f1cc0f203038e733223ddf21b796e696ba508b SHA512 9af0b9f17969a6601c3945fbe3d3d10dc6707df0c88e86e1c2f1617e9b750019a21d05cecab5e726069b9908ba6345d2e190732d3960bbb87674d1f983e311ee -EBUILD blender-2.79.ebuild 8049 BLAKE2B b4effa99e23ee172e685dff46235c88aecf129a40ab4e01a7b8dd0fb4993e52849c5ebbc712ff63999176644ea9027e572b1f21f4838d31845a525d09d396bbd SHA512 7b660679c69df11a108e58e76cc2e950843bf0285e962cf1f776b3cabf8e7b187ab65984ff6e4bd85120347489d10853ab163d916a4f1c833d890112dd2692c6 EBUILD blender-2.79b-r1.ebuild 8163 BLAKE2B cfa1181a4044655d55606a1ab20105aa41b629671e6c6ae7ab501f7de199a4369b07a100a33ff9a0caa33869e57ceadeb5ec0976aa32e7f0fb336efa2b8de4b3 SHA512 705967cd0c67a2185f17fb335320dfc5b69c605c6e6615a1b84aa7073a3bf9c34adbf0b43d90707e54bba1219b5472eb320aa22f6897afa1a9ac0b6fcb1860eb MISC metadata.xml 2642 BLAKE2B 9575416eeb3ef81373e60263e095b5dcd441b710945775ae3a79c1bfd5b511e15751d37c0e9f6833d2e7de9f39d628a1e3c6c91707b3ee1573e64e8e1ae4b874 SHA512 0bc219e6065e76753c1dbe1aeee7c277d29e6574db388994e2dac13ecf4837233155e4c319bf41f484c7341a074dc2b60dd0b86a350ac438504205c555761b4f diff --git a/media-gfx/blender/blender-2.79-r1.ebuild b/media-gfx/blender/blender-2.79-r1.ebuild deleted file mode 100644 index 2db487bd238b..000000000000 --- a/media-gfx/blender/blender-2.79-r1.ebuild +++ /dev/null @@ -1,290 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{3_5,3_6} ) - -inherit check-reqs cmake-utils xdg-utils flag-o-matic gnome2-utils \ - pax-utils python-single-r1 toolchain-funcs versionator - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="https://www.blender.org" - -SRC_URI="https://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="+bullet +dds +elbeem +game-engine +openexr collada colorio \ - cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \ - llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \ - osl player sdl sndfile test tiff valgrind" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine !headless ) - cuda? ( cycles ) - cycles? ( openexr tiff openimageio ) - opencl? ( cycles ) - osl? ( cycles llvm )" - -RDEPEND="${PYTHON_DEPS} - >=dev-libs/boost-1.62:=[nls?,threads(+)] - 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 - collada? ( >=media-libs/opencollada-1.6.18:= ) - colorio? ( media-libs/opencolorio ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - ffmpeg? ( =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? ( virtual/jack ) - 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 ) - opencl? ( virtual/opencl ) - openimageio? ( >=media-libs/openimageio-1.7.0 ) - openexr? ( - >=media-libs/ilmbase-2.2.0:= - >=media-libs/openexr-2.2.0:= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) - openvdb? ( - =dev-libs/c-blosc-1.5.2 - ) - osl? ( media-libs/osl:= ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 ) - valgrind? ( dev-util/valgrind )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - >=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}/${P}-fix-build-with-OSL-1.9.x.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() { - cmake-utils_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 - 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=ON - -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=$(usex osl) - -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=$(usex opencl) - -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/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 "${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 - xdg_mimeinfo_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_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 "" -} diff --git a/media-gfx/blender/blender-2.79.ebuild b/media-gfx/blender/blender-2.79.ebuild deleted file mode 100644 index 7a99f994dd2f..000000000000 --- a/media-gfx/blender/blender-2.79.ebuild +++ /dev/null @@ -1,287 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{3_5,3_6} ) - -inherit check-reqs cmake-utils xdg-utils flag-o-matic gnome2-utils \ - pax-utils python-single-r1 toolchain-funcs versionator - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="https://www.blender.org" - -SRC_URI="https://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="+bullet +dds +elbeem +game-engine +openexr collada colorio \ - cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \ - llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \ - osl player sdl sndfile test tiff valgrind" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine !headless ) - cuda? ( cycles ) - cycles? ( openexr tiff openimageio ) - opencl? ( cycles ) - osl? ( cycles llvm )" - -RDEPEND="${PYTHON_DEPS} - >=dev-libs/boost-1.62:=[nls?,threads(+)] - 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 - collada? ( >=media-libs/opencollada-1.6.18:= ) - colorio? ( media-libs/opencolorio ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - ffmpeg? ( =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? ( virtual/jack ) - 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 ) - opencl? ( virtual/opencl ) - openimageio? ( >=media-libs/openimageio-1.7.0 ) - openexr? ( - >=media-libs/ilmbase-2.2.0:= - >=media-libs/openexr-2.2.0:= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) - openvdb? ( - =dev-libs/c-blosc-1.5.2 - ) - osl? ( media-libs/osl:= ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 ) - valgrind? ( dev-util/valgrind )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - >=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" ) - -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-utils_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 - 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=ON - -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=$(usex osl) - -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=$(usex opencl) - -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/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 "${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 - xdg_mimeinfo_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_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 "" -} diff --git a/media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch b/media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch deleted file mode 100644 index 6b22f9335fd7..000000000000 --- a/media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d089875c4c753f084e02849462ec1bd6f785eadf Mon Sep 17 00:00:00 2001 -From: Brecht Van Lommel -Date: Sat, 18 Nov 2017 06:11:17 +0100 -Subject: [PATCH] Fix build with OSL 1.9.x, automatically aligns to 16 bytes - now. - ---- - intern/cycles/kernel/osl/osl_closures.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp -index e3e85705ebc..597d25e9f30 100644 ---- a/intern/cycles/kernel/osl/osl_closures.cpp -+++ b/intern/cycles/kernel/osl/osl_closures.cpp -@@ -232,7 +232,11 @@ static void register_closure(OSL::ShadingSystem *ss, const char *name, int id, O - /* optimization: it's possible to not use a prepare function at all and - * only initialize the actual class when accessing the closure component - * data, but then we need to map the id to the class somehow */ -+#if OSL_LIBRARY_VERSION_CODE >= 10900 -+ ss->register_closure(name, id, params, prepare, NULL); -+#else - ss->register_closure(name, id, params, prepare, NULL, 16); -+#endif - } - - void OSLShader::register_closures(OSLShadingSystem *ss_) -- cgit v1.2.3