commit: 70a6bf73959309592da602eac78f1666f85fd946 Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com> AuthorDate: Thu Apr 6 10:01:40 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Apr 16 02:45:59 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70a6bf73
media-gfx/blender: Bump 3.3.5, update python use versions 2.93 will not work with python 3.11, so that version is left out Closes: https://bugs.gentoo.org/896980 Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/blender/Manifest | 1 + .../{blender-9999.ebuild => blender-3.3.5.ebuild} | 74 ++++++++-------------- ...blender-9999.ebuild => blender-3.4.1-r1.ebuild} | 33 ++++------ media-gfx/blender/blender-9999.ebuild | 2 +- 4 files changed, 44 insertions(+), 66 deletions(-) diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 35bf4c6d6a6c..26a65712459f 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -4,4 +4,5 @@ DIST blender-2.93.14.tar.xz 43035804 BLAKE2B 72ca99143da393bb23e15a26e197c5ac45c DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B 2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9 SHA512 c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e764583525555ca6d653da809 DIST blender-3.3.2.tar.xz 41918064 BLAKE2B 76e689eff9f1e9c1c4e8a9e000a3dec64d7340815966522acb4d827197fae51854060cdfa38104950711fed23b9c66b39011727cf673c1a3e05340a32d2e7783 SHA512 2059cb38dfb56696f80d91420f5f0d1c808b59f4cc7ea71e7ff8e00cfe1cddf8762bcb129f941de8d57c7c72403d88ba4082fca065b59eb17a6d76c2e5006778 DIST blender-3.3.3.tar.xz 41918008 BLAKE2B 6fbd959e18cab6af597a95a4aa392bdc45d53e1efaefc4c4012ce4d1233c3f1118f04833ae6e7c8a2296f127714c665e0de454f2c09887986f5e721dbae3390b SHA512 1560bee9dd770ecd56b1dd3f4b8f3b3b8ba70c4796c0118d13da54f0d8950f26b17678cf66f95f5fcf59d81931518343d401624877fed63f510e3c0ffaea6e83 +DIST blender-3.3.5.tar.xz 41889880 BLAKE2B 145589da5170c760901bf1ca9e9dec8d0b05602aa975cb0e74aadbeb96f326ecd5e0f92cd329c4f70e17c9e3590cf9b1c6611e157c984acd1e9bd06134fee17e SHA512 021deb19cf5e1ccf30e41ff8635ba441d48eddcf4778a11f7c089e6b54f44197fb3679eb967d2ffce47884759b563f20dfbb9a3ee027f79ca78bc3080bd0e85f DIST blender-3.4.1.tar.xz 53666296 BLAKE2B ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee SHA512 d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-3.3.5.ebuild similarity index 87% copy from media-gfx/blender/blender-9999.ebuild copy to media-gfx/blender/blender-3.3.5.ebuild index 91dbd95c84f7..6034a136dbad 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-3.3.5.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_10 python3_11 ) inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils @@ -13,30 +13,29 @@ HOMEPAGE="https://www.blender.org"; if [[ ${PV} = *9999* ]] ; then # Subversion is needed for downloading unit test files inherit git-r3 subversion - EGIT_REPO_URI="https://projects.blender.org/blender/blender.git"; - ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git"; + EGIT_REPO_URI="https://git.blender.org/blender.git"; else SRC_URI="https://download.blender.org/source/${P}.tar.xz"; # Update these between major releases. TEST_TARBALL_VERSION="$(ver_cut 1-2).0" - SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" + #SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" KEYWORDS="~amd64 ~arm ~arm64" fi SLOT="${PV%.*}" LICENSE="|| ( GPL-3 BL )" IUSE="+bullet +dds +fluid +openexr +tbb \ - alembic collada +color-management cuda +cycles cycles-bin-kernels \ - debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k \ - man +nanovdb ndof nls openal +oidn +openmp +openpgl +opensubdiv \ - +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl \ - +sndfile test +tiff valgrind wayland X" -RESTRICT="!test? ( test )" + alembic collada +color-management cuda +cycles \ + debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \ + man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ + +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \ + test +tiff valgrind" +RESTRICT="!test? ( test ) test" REQUIRED_USE="${PYTHON_REQUIRED_USE} alembic? ( openexr ) cuda? ( cycles ) - cycles? ( openexr tiff ) + cycles? ( openexr tiff openimageio ) fluid? ( tbb ) openvdb? ( tbb ) optix? ( cuda ) @@ -55,11 +54,10 @@ RDEPEND="${PYTHON_DEPS} dev-python/requests[${PYTHON_USEDEP}] ') media-libs/freetype:=[brotli] - media-libs/libepoxy:= + media-libs/glew:* media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate - >=media-libs/openimageio-2.4.6.0:= sys-libs/zlib:= virtual/glu virtual/libintl @@ -72,6 +70,11 @@ RDEPEND="${PYTHON_DEPS} 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= ) @@ -82,11 +85,11 @@ RDEPEND="${PYTHON_DEPS} nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) + openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) - openpgl? ( media-libs/openpgl ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] @@ -103,18 +106,6 @@ RDEPEND="${PYTHON_DEPS} tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff:= ) valgrind? ( dev-util/valgrind ) - wayland? ( - >=dev-libs/wayland-1.12 - >=dev-libs/wayland-protocols-1.15 - >=x11-libs/libxkbcommon-0.2.0 - media-libs/mesa[wayland] - sys-apps/dbus - ) - X? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) " DEPEND="${RDEPEND} @@ -133,11 +124,15 @@ BDEPEND=" dev-texlive/texlive-latexextra ) nls? ( sys-devel/gettext ) - wayland? ( - dev-util/wayland-scanner - ) " +PATCHES=( + "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch + "${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch + "${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch + "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch +) + blender_check_requirements() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -170,16 +165,10 @@ pkg_setup() { src_unpack() { if [[ ${PV} = *9999* ]] ; then git-r3_src_unpack - - git-r3_fetch ${ADDONS_EGIT_REPO_URI} - git-r3_checkout ${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons - if use test; then TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests subversion_fetch ${TESTS_SVN_URL} ../lib/tests fi - ASSETS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets - subversion_fetch ${ASSETS_SVN_URL} ../lib/assets else default if use test; then @@ -216,14 +205,13 @@ src_prepare() { 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|set(TEST_INSTALL_DIR.*|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 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 - blender_get_version local mycmakeargs=( -DBUILD_SHARED_LIBS=OFF @@ -238,26 +226,18 @@ src_configure() { -DWITH_CODEC_SNDFILE=$(usex sndfile) -DWITH_CXX_GUARDEDALLOC=$(usex debug) -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_CUDA_BINARIES=$(usex cycles-bin-kernels) -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix) -DWITH_CYCLES_EMBREE=$(usex embree) -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_CYCLES_PATH_GUIDING=$(usex openpgl) -DWITH_CYCLES_STANDALONE=OFF -DWITH_CYCLES_STANDALONE_GUI=OFF -DWITH_DOC_MANPAGE=$(usex man) -DWITH_FFTW3=$(usex fftw) - -DWITH_GHOST_WAYLAND=$(usex wayland) - -DWITH_GHOST_WAYLAND_APP_ID=blender-${BV} - -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland) - -DWITH_GHOST_WAYLAND_DYNLOAD=OFF - -DWITH_GHOST_WAYLAND_LIBDECOR=OFF - -DWITH_GHOST_X11=$(usex X) -DWITH_GMP=$(usex gmp) -DWITH_GTESTS=$(usex test) -DWITH_HARU=$(usex pdf) - -DWITH_HEADLESS=$($(use X || use wayland) && echo OFF || echo ON) + -DWITH_HEADLESS=$(usex headless) -DWITH_INSTALL_PORTABLE=OFF -DWITH_IMAGE_DDS=$(usex dds) -DWITH_IMAGE_OPENEXR=$(usex openexr) @@ -275,6 +255,7 @@ src_configure() { -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) @@ -287,6 +268,7 @@ src_configure() { -DWITH_STATIC_LIBS=OFF -DWITH_SYSTEM_EIGEN3=ON -DWITH_SYSTEM_FREETYPE=ON + -DWITH_SYSTEM_GLEW=ON -DWITH_SYSTEM_LZO=ON -DWITH_TBB=$(usex tbb) -DWITH_USD=OFF diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-3.4.1-r1.ebuild similarity index 93% copy from media-gfx/blender/blender-9999.ebuild copy to media-gfx/blender/blender-3.4.1-r1.ebuild index 91dbd95c84f7..ebd952e9cdd4 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-3.4.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_10 python3_11 ) inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils @@ -13,30 +13,29 @@ HOMEPAGE="https://www.blender.org"; if [[ ${PV} = *9999* ]] ; then # Subversion is needed for downloading unit test files inherit git-r3 subversion - EGIT_REPO_URI="https://projects.blender.org/blender/blender.git"; - ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git"; + EGIT_REPO_URI="https://git.blender.org/blender.git"; else SRC_URI="https://download.blender.org/source/${P}.tar.xz"; # Update these between major releases. TEST_TARBALL_VERSION="$(ver_cut 1-2).0" - SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" + #SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" KEYWORDS="~amd64 ~arm ~arm64" fi SLOT="${PV%.*}" LICENSE="|| ( GPL-3 BL )" IUSE="+bullet +dds +fluid +openexr +tbb \ - alembic collada +color-management cuda +cycles cycles-bin-kernels \ + alembic collada +color-management cuda +cycles \ debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k \ - man +nanovdb ndof nls openal +oidn +openmp +openpgl +opensubdiv \ - +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl \ - +sndfile test +tiff valgrind wayland X" + man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \ + +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \ + test +tiff valgrind wayland X" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} alembic? ( openexr ) cuda? ( cycles ) - cycles? ( openexr tiff ) + cycles? ( openexr tiff openimageio ) fluid? ( tbb ) openvdb? ( tbb ) optix? ( cuda ) @@ -59,7 +58,6 @@ RDEPEND="${PYTHON_DEPS} media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/libsamplerate - >=media-libs/openimageio-2.4.6.0:= sys-libs/zlib:= virtual/glu virtual/libintl @@ -82,11 +80,11 @@ RDEPEND="${PYTHON_DEPS} nls? ( virtual/libiconv ) openal? ( media-libs/openal ) oidn? ( >=media-libs/oidn-1.4.1 ) + openimageio? ( >=media-libs/openimageio-2.3.12.0-r3:= ) openexr? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= ) - openpgl? ( media-libs/openpgl ) opensubdiv? ( >=media-libs/opensubdiv-3.4.0 ) openvdb? ( >=media-gfx/openvdb-9.0.0:=[nanovdb?] @@ -138,6 +136,10 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch +) + blender_check_requirements() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp @@ -170,16 +172,10 @@ pkg_setup() { src_unpack() { if [[ ${PV} = *9999* ]] ; then git-r3_src_unpack - - git-r3_fetch ${ADDONS_EGIT_REPO_URI} - git-r3_checkout ${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons - if use test; then TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests subversion_fetch ${TESTS_SVN_URL} ../lib/tests fi - ASSETS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets - subversion_fetch ${ASSETS_SVN_URL} ../lib/assets else default if use test; then @@ -238,12 +234,10 @@ src_configure() { -DWITH_CODEC_SNDFILE=$(usex sndfile) -DWITH_CXX_GUARDEDALLOC=$(usex debug) -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_CUDA_BINARIES=$(usex cycles-bin-kernels) -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix) -DWITH_CYCLES_EMBREE=$(usex embree) -DWITH_CYCLES_OSL=$(usex osl) - -DWITH_CYCLES_PATH_GUIDING=$(usex openpgl) -DWITH_CYCLES_STANDALONE=OFF -DWITH_CYCLES_STANDALONE_GUI=OFF -DWITH_DOC_MANPAGE=$(usex man) @@ -275,6 +269,7 @@ src_configure() { -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) diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index 91dbd95c84f7..77ff3594ed06 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_10 python3_11 ) inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils
