From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 54159158CB7 for ; Wed, 18 Aug 2021 23:34:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C0E6E07FA; Wed, 18 Aug 2021 23:34:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E320DE07FA for ; Wed, 18 Aug 2021 23:34:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D5EF342A54 for ; Wed, 18 Aug 2021 23:34:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 736078B3 for ; Wed, 18 Aug 2021 23:34:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1629329571.798c483ba8e0ca2db8b2470b254e9ab03d3860dd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/blender/Manifest media-gfx/blender/blender-2.83.17.ebuild media-gfx/blender/blender-2.93.2.ebuild media-gfx/blender/blender-9999.ebuild X-VCS-Directories: media-gfx/blender/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 798c483ba8e0ca2db8b2470b254e9ab03d3860dd X-VCS-Branch: master Date: Wed, 18 Aug 2021 23:34:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ab82925a-c49b-4b43-9cd3-abb7df42ccd8 X-Archives-Hash: dbbaebf95c2ff7fa6850bde241b541ff commit: 798c483ba8e0ca2db8b2470b254e9ab03d3860dd Author: Sebastian Parborg gmail com> AuthorDate: Sun Aug 15 12:10:35 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Aug 18 23:32:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=798c483b media-gfx/blender: Bump to latest LTS point releases Signed-off-by: Sebastian Parborg gmail.com> Signed-off-by: Sam James gentoo.org> media-gfx/blender/Manifest | 2 + ...{blender-9999.ebuild => blender-2.83.17.ebuild} | 92 ++++++++++------------ .../{blender-9999.ebuild => blender-2.93.2.ebuild} | 22 +++--- media-gfx/blender/blender-9999.ebuild | 13 ++- 4 files changed, 57 insertions(+), 72 deletions(-) diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 3e0430a8d59..142447598c2 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,6 +1,8 @@ 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.83.17.tar.xz 39128468 BLAKE2B 3a20f6125f94e0d6de4d78e7a784c5a37faf23603e055a28ee67e48a41d09d3715222b2ac4f04ed38619dca686e7e0985ad60c983ee3a15c96042e419f152e69 SHA512 1e4c9a1f604802fb94c8e844f3878756e2ba0a6c29a6fb8863bc21ada1c8e14e775b203ab21bc4d53e85eb4e909e889204bb9f5befcff56cec3d56c2e987c2a0 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 DIST blender-2.93.1.tar.xz 42960100 BLAKE2B eda0a8c0414d1f7c89d21e34ba238b0cbe337ea755d6f10792e7c3bd5e15934184d3bd853ed636764776095ce1e3f081d63386b7c13fb7ac666580bf9eeb43c8 SHA512 b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1 +DIST blender-2.93.2.tar.xz 43028440 BLAKE2B 02ffc5be190445c97e3cb14e4635969df7a7aaf0100ee5ba50f2d283b077ffebf1f139aec86034ed2df03d94290d5a8bb369f88c734db5103869ffa1d3f588a6 SHA512 5dac627b0e5f38af1f861d4fddb01f4ba1e992c704337c56e2ebbfdcbd62e6de83195e3541342603a1ae966e89a06ff98764c817e282401edd792857d577b989 diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-2.83.17.ebuild similarity index 84% copy from media-gfx/blender/blender-9999.ebuild copy to media-gfx/blender/blender-2.83.17.ebuild index 7b72a280eb4..23d3ee9f731 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-2.83.17.ebuild @@ -3,9 +3,9 @@ EAPI=7 -PYTHON_COMPAT=( python3_9 ) +PYTHON_COMPAT=( python3_8 ) -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs subversion xdg-utils +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" @@ -15,16 +15,18 @@ if [[ ${PV} = *9999* ]] ; then 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 +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" + 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} @@ -36,7 +38,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} openvdb? ( tbb ) osl? ( cycles ) standalone? ( cycles ) - test? ( color-management )" + 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 @@ -58,12 +60,10 @@ RDEPEND="${PYTHON_DEPS} 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 ) + color-management? ( =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 @@ -79,7 +79,6 @@ RDEPEND="${PYTHON_DEPS} 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:= @@ -87,18 +86,13 @@ RDEPEND="${PYTHON_DEPS} ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) openvdb? ( - >=media-gfx/openvdb-7.1.0 + >=media-gfx/openvdb-7.0.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 ) + osl? ( 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 + # Add period. + BV=${BV:0:1}.${BV:1} } pkg_pretend() { @@ -152,15 +148,14 @@ pkg_setup() { src_unpack() { if [[ ${PV} = *9999* ]] ; then - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests git-r3_src_unpack else default - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests fi if use test; then - subversion_fetch ${TESTS_SVN_URL} ../lib/tests + mkdir -p lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die fi } @@ -197,6 +192,11 @@ src_prepare() { } 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=( @@ -211,18 +211,15 @@ src_configure() { -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=$(usex cycles) -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_CYCLES_OSL=$(usex osl) -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) @@ -236,19 +233,14 @@ src_configure() { -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) @@ -258,13 +250,9 @@ src_configure() { -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 + append-flags $(usex debug '-DDEBUG' '-DNDEBUG') + cmake_src_configure } @@ -302,6 +290,8 @@ src_test() { 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 @@ -362,14 +352,12 @@ pkg_postinst() { 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 + 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 diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-2.93.2.ebuild similarity index 96% copy from media-gfx/blender/blender-9999.ebuild copy to media-gfx/blender/blender-2.93.2.ebuild index 7b72a280eb4..e71a2a7ce9f 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-2.93.2.ebuild @@ -5,17 +5,20 @@ EAPI=7 PYTHON_COMPAT=( python3_9 ) -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs subversion xdg-utils +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 + # Subversion is needed for downloading unit test files + inherit git-r3 subversion EGIT_REPO_URI="https://git.blender.org/blender.git" else SRC_URI="https://download.blender.org/source/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" + 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%.*}" @@ -98,7 +101,6 @@ RDEPEND="${PYTHON_DEPS} 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 ) " @@ -152,15 +154,14 @@ pkg_setup() { src_unpack() { if [[ ${PV} = *9999* ]] ; then - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests git-r3_src_unpack else default - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests fi if use test; then - subversion_fetch ${TESTS_SVN_URL} ../lib/tests + mkdir -p lib || die + mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die fi } @@ -260,11 +261,8 @@ src_configure() { -DWITH_USD=OFF -DWITH_XR_OPENXR=OFF ) - if ! use debug ; then - append-flags -DNDEBUG - else - append-flags -DDEBUG - fi + append-flags $(usex debug '-DDEBUG' '-DNDEBUG') + cmake_src_configure } diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index 7b72a280eb4..b16ab770202 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -5,13 +5,14 @@ EAPI=7 PYTHON_COMPAT=( python3_9 ) -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs subversion xdg-utils +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 + # Subversion is needed for downloading unit test files + inherit git-r3 subversion EGIT_REPO_URI="https://git.blender.org/blender.git" else SRC_URI="https://download.blender.org/source/${P}.tar.xz" @@ -98,7 +99,6 @@ RDEPEND="${PYTHON_DEPS} 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 ) " @@ -260,11 +260,8 @@ src_configure() { -DWITH_USD=OFF -DWITH_XR_OPENXR=OFF ) - if ! use debug ; then - append-flags -DNDEBUG - else - append-flags -DDEBUG - fi + append-flags $(usex debug '-DDEBUG' '-DNDEBUG') + cmake_src_configure }