commit: 73c8d56ddf91c00ab2e6fe923ed39a078df2b9bd Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Mon Nov 24 19:31:20 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Nov 28 02:53:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c8d56d
media-gfx/blender: add 5.0.0 5.0.9999, update 9999 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44694 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/blender/Manifest | 2 + .../{blender-9999.ebuild => blender-5.0.0.ebuild} | 51 ++++++++-------------- ...blender-9999.ebuild => blender-5.0.9999.ebuild} | 51 ++++++++-------------- media-gfx/blender/blender-9999.ebuild | 50 ++++++++------------- media-gfx/blender/metadata.xml | 8 +++- 5 files changed, 66 insertions(+), 96 deletions(-) diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index ac2b451f1578..32964f231584 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -5,6 +5,8 @@ DIST blender-4.3.2.tar.xz 74473996 BLAKE2B 9a5c8973561f3296b0ec35990ab4951e34f7c DIST blender-4.4.1.tar.xz 85518840 BLAKE2B a482a2d246222b5395f5e1c5cfa9fd2dbab0d5dc33145ec5cfaae3e7d7083e65034e1f5b54bc4605ab45905d08c2938c97ab488659d822997ee853c9e34fcc55 SHA512 db6b117b841890b172f4d13c6f38b73f36aae5648ed74f5233eb311328d467644005bd24fb4f9c7ea9b2dad7ff584fc7b3831f5ab34f3f900555c68f4af5b901 DIST blender-4.4.3.tar.xz 85519376 BLAKE2B bb2f93d96b98e4104f1e49f3bd9be8992e37d2005665ad913ccd7e9097fba4823567d0aba3cd6487097d52043c5681fde4489c040e24ae4df6014337eb97f9f5 SHA512 0a500a7abee2e2dea7cdc925539c3f906271525ec88877e12920315552a057072c68806d6cdf7a6eb43b2b7d611e8697c5ad093b22f2402f96a11718538012e6 DIST blender-4.5.5.tar.xz 85095244 BLAKE2B 5578a45300622f71bb7dd679dcaa85f2de0a3db2ddc9e21a6890ed96b83d14f8b617058e8fc648ae0e02b70e5706c05427f9d1cf44848995ca95b5fd074d616f SHA512 14f340e44ee0f2971a9367f35a150bec61d7c378d1a5d60060e16c2e60f8fdffe71d2252e679698aa0a7a6b77e9b353c67d7494e8ba9990f479b834bb6d9b1de +DIST blender-5.0.0.tar.xz 88881428 BLAKE2B ca2b5bbbe860597099a310ed4bdb63fb8648d5745e16da59b9ada6fe72ba1d75b884357508ddc62e4b7b1cf7fdfcb028b11d9ded89a64153d511fed3caf78245 SHA512 5f4cf6fa2360ccfbd28c3a0abcf8a4aba7e4d03f7eb7df75bfcfbfb72896cc6628c54d17631e458513fc02ef7f5101a607548c0fcfbafd242d4a2d72864ccf3c DIST blender-assets-4.3.2.tar.xz 8763844 BLAKE2B 0eca4a7bfb630096dfe9dd5f8c8071d9ca8c1aaab560a8694df4add507c3e8a641a4e0ad197f110b639d2d399a23c5c25af6fb060ca3316e1a44d286f6b23f7e SHA512 ce9483b3e5b83d1b29bdfa3a14f7be7176e85ec50a414213a67badcce3c24cd8da349fee22b08cc95d6e5906420bbcd5c5f15855445da6364e6054f968c20678 DIST blender-test-data-4.4.0.tar.xz 386262908 BLAKE2B 4b7f16f5d19d9569ae19a8e9feeb134841801c89ea64a787c1caa6a4bddce700ebe2a9a15cb2053701c404743dc0749643a1b03fc45f523f792e3729de11f0e8 SHA512 babd235aeb5cf87764b48000dc7776b5e8121d60d930f4aa92ea27cf275608cfc6c3ed47e59d499c85c670dc1ee329e26882e76d8a9a2567b42d3de551a5a9a0 DIST blender-test-data-4.5.0-1.tar.xz 408765680 BLAKE2B b09840a18a78f8972424a58ad6b36c9e30019862c8217211ef09b9f910eb1ca9facc2ad14fb9bbb49dcf7c0ed7e082e7dcfc57c08daad9bf18fed4bfb2588b86 SHA512 09fcbb76a673a1e0c53f35bf60a74f09b5123ea37c99f5f0d027043caad184a16e3eea407c81027229e4a3a5c1ad8e66b4432ed90a9c8980e466e8b4575fa34b +DIST blender-test-data-5.0.0.tar.xz 424858204 BLAKE2B 93a35706481204fbfb310c7dad664bcbf95a9e9083a31ab4cf390c756baf7c6687bcd998644161a828c8d909db986512aba62f2ea8fd1d59649eefb45b719be2 SHA512 f03ea7ff5f59a71c08c3e4489ef46f2cbdf2a3680c531e670be1b2f3b323f5931986acf9b7df337e0d2b2762bc7a693b354d71dbc6759d72f95c5672406ef396 diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-5.0.0.ebuild similarity index 95% copy from media-gfx/blender/blender-9999.ebuild copy to media-gfx/blender/blender-5.0.0.ebuild index 467a83667254..c4845587b821 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-5.0.0.ebuild @@ -20,7 +20,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) # NOTE must match media-libs/osl -LLVM_COMPAT=( {18..20} ) +LLVM_COMPAT=( {20..20} ) LLVM_OPTIONAL=1 ROCM_SKIP_GLOBALS=1 @@ -65,11 +65,11 @@ SLOT="${BLENDER_BRANCH}" # NOTE +openpgl breaks on very old amd64 hardware # potentially mirror cpu_flags_x86 + REQUIRED_USE IUSE=" - alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels + alembic +bullet +color-management cuda +cycles +cycles-bin-kernels debug doc +embree +ffmpeg +fftw +fluid +gmp gnome hip hiprt jack jemalloc jpeg2k man +manifold +nanovdb ndof nls +oidn openal +openexr +opengl +openpgl +opensubdiv +openvdb optix osl pipewire +pdf +potrace +pugixml pulseaudio - renderdoc sdl +sndfile +tbb test +tiff +truetype valgrind vulkan wayland +webp X + renderdoc +rubberband sdl +sndfile +tbb test +tiff +truetype valgrind vulkan wayland +webp X " if [[ "${PV}" == *9999* ]]; then @@ -99,12 +99,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # Library versions for official builds can be found in the blender source directory in: # build_files/build_environment/cmake/versions.cmake + RDEPEND="${PYTHON_DEPS} app-arch/zstd dev-cpp/gflags:= dev-cpp/glog:= dev-libs/boost:=[nls?] - dev-libs/lzo:2= $(python_gen_cond_dep ' dev-python/cattrs[${PYTHON_USEDEP}] dev-python/cython[${PYTHON_USEDEP}] @@ -112,20 +112,19 @@ RDEPEND="${PYTHON_DEPS} dev-python/requests[${PYTHON_USEDEP}] dev-python/zstandard[${PYTHON_USEDEP}] ') - media-libs/freetype:=[brotli] + >=media-libs/freetype-2.13.3:=[brotli] media-libs/libepoxy:= media-libs/libjpeg-turbo:= - media-libs/libpng:= + >=media-libs/libpng-1.6.50:= media-libs/libsamplerate - >=media-libs/openimageio-3.0.6.1:= + >=media-libs/openimageio-3.0.9.1:= virtual/glu virtual/libintl virtual/opengl[X?] virtual/zlib:= alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) bullet? ( sci-physics/bullet:=[double-precision] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( media-libs/opencolorio:= ) + color-management? ( >=media-libs/opencolorio-2.4.2:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( media-libs/embree:=[raymask] ) ffmpeg? ( media-video/ffmpeg:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] ) @@ -133,15 +132,15 @@ RDEPEND="${PYTHON_DEPS} gmp? ( dev-libs/gmp:=[cxx] ) gnome? ( gui-libs/libdecor ) hip? ( - >=dev-util/hip-5.7:= + >=dev-util/hip-6.0:= hiprt? ( dev-libs/hiprt:2.5= ) ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - manifold? ( >=sci-mathematics/manifold-3.1.0:= ) + jpeg2k? ( >=media-libs/openjpeg-2.5.3:2= ) + manifold? ( >=sci-mathematics/manifold-3.2.1:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav @@ -151,7 +150,7 @@ RDEPEND="${PYTHON_DEPS} oidn? ( >=media-libs/oidn-2.1.0:= ) openexr? ( >=dev-libs/imath-3.1.7:= - >=media-libs/openexr-3.2.1:0= + >=media-libs/openexr-3.3.5:0= ) openpgl? ( media-libs/openpgl:= ) opensubdiv? ( >=media-libs/opensubdiv-3.6.0-r2:=[opengl,cuda?,tbb?] ) @@ -166,21 +165,22 @@ RDEPEND="${PYTHON_DEPS} ) ) osl? ( - >=media-libs/osl-1.14:=[${LLVM_USEDEP}] + >=media-libs/osl-1.14.7.0:=[${LLVM_USEDEP}] media-libs/mesa[${LLVM_USEDEP}] ) - pdf? ( media-libs/libharu:= ) pipewire? ( >=media-video/pipewire-1.1.0:= ) + pdf? ( >=media-libs/libharu-2.4.5:= ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-libs/libpulse ) + rubberband? ( >=media-libs/rubberband-4.0.0:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff:= ) valgrind? ( dev-debug/valgrind ) wayland? ( - >=dev-libs/wayland-1.12 + >=dev-libs/wayland-1.24.0 >=dev-libs/wayland-protocols-1.15 >=x11-libs/libxkbcommon-0.2.0 dev-util/wayland-scanner @@ -258,9 +258,6 @@ PATCHES=( "${FILESDIR}/${PN}-4.1.1-FindLLVM.patch" "${FILESDIR}/${PN}-4.1.1-numpy.patch" "${FILESDIR}/${PN}-4.3.2-system-glog.patch" - "${FILESDIR}/${PN}-4.5.0-ffmpeg-8.0.patch" - "${FILESDIR}/${PN}-4.5.3-cmake-policy-3.10.patch" - "${FILESDIR}/${PN}-9999-don-t-show-variable-names.patch" ) blender_check_requirements() { @@ -392,12 +389,6 @@ src_prepare() { -i "build_files/cmake/testing.cmake" \ || die "REPLACE.*TEST_INSTALL_DIR" - # assertEquals was deprecated in Python-3.2 use assertEqual instead - sed \ - -e 's/assertEquals/assertEqual/g' \ - -i tests/python/bl_animation_action.py \ - || die - sed -e '1i #include <cstdint>' -i extern/gtest/src/gtest-death-test.cc || die else cmake_comment_add_subdirectory tests @@ -449,7 +440,6 @@ src_configure() { -DWITH_MANIFOLD="$(usex manifold)" -DWITH_MATERIALX="no" # TODO: Package MaterialX -DWITH_NANOVDB="$(usex nanovdb)" - -DWITH_OPENCOLLADA="$(usex collada)" -DWITH_OPENCOLORIO="$(usex color-management)" -DWITH_OPENGL_BACKEND="$(usex opengl)" -DWITH_OPENIMAGEDENOISE="$(usex oidn)" @@ -463,7 +453,7 @@ src_configure() { -DWITH_TBB="$(usex tbb)" -DWITH_UNITY_BUILD="no" -DWITH_USD="no" # TODO: Package USD - -DWITH_VULKAN_BACKEND="$(usex vulkan)" # experimental + -DWITH_VULKAN_BACKEND="$(usex vulkan)" -DWITH_XR_OPENXR="no" -DWITH_SYSTEM_BULLET="yes" @@ -471,7 +461,6 @@ src_configure() { -DWITH_SYSTEM_FREETYPE="yes" -DWITH_SYSTEM_GFLAGS="yes" -DWITH_SYSTEM_GLOG="yes" - -DWITH_SYSTEM_LZO="yes" # Compiler Options: # -DWITH_BUILDINFO="yes" @@ -538,7 +527,6 @@ src_configure() { -DWITH_CYCLES_OSL="$(usex osl)" -DWITH_CYCLES_EMBREE="$(usex embree)" -DWITH_CYCLES_PATH_GUIDING="$(usex openpgl)" - -DWITH_CYCLES_LOGGING="ON" # "$(usex debug)" -DWITH_CYCLES_DEVICE_OPTIX="$(usex optix)" -DWITH_CYCLES_DEVICE_CUDA="$(usex cuda)" @@ -564,10 +552,9 @@ src_configure() { # -DWITH_INPUT_IME=ON # -DWITH_LIBMV=ON # -DWITH_LIBMV_SCHUR_SPECIALIZATIONS=ON - # -DWITH_LZMA=ON - # -DWITH_LZO=ON # -DWITH_UV_SLIM=ON - -DWITH_NINJA_POOL_JOBS="no" + -DWITH_NINJA_POOL_JOBS="yes" + -DWITH_RUBBERBAND="$(usex rubberband)" # -DPOSTINSTALL_SCRIPT:PATH="" # -DPOSTCONFIGURE_SCRIPT:PATH="" ) diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-5.0.9999.ebuild similarity index 95% copy from media-gfx/blender/blender-9999.ebuild copy to media-gfx/blender/blender-5.0.9999.ebuild index 467a83667254..c4845587b821 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-5.0.9999.ebuild @@ -20,7 +20,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) # NOTE must match media-libs/osl -LLVM_COMPAT=( {18..20} ) +LLVM_COMPAT=( {20..20} ) LLVM_OPTIONAL=1 ROCM_SKIP_GLOBALS=1 @@ -65,11 +65,11 @@ SLOT="${BLENDER_BRANCH}" # NOTE +openpgl breaks on very old amd64 hardware # potentially mirror cpu_flags_x86 + REQUIRED_USE IUSE=" - alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels + alembic +bullet +color-management cuda +cycles +cycles-bin-kernels debug doc +embree +ffmpeg +fftw +fluid +gmp gnome hip hiprt jack jemalloc jpeg2k man +manifold +nanovdb ndof nls +oidn openal +openexr +opengl +openpgl +opensubdiv +openvdb optix osl pipewire +pdf +potrace +pugixml pulseaudio - renderdoc sdl +sndfile +tbb test +tiff +truetype valgrind vulkan wayland +webp X + renderdoc +rubberband sdl +sndfile +tbb test +tiff +truetype valgrind vulkan wayland +webp X " if [[ "${PV}" == *9999* ]]; then @@ -99,12 +99,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # Library versions for official builds can be found in the blender source directory in: # build_files/build_environment/cmake/versions.cmake + RDEPEND="${PYTHON_DEPS} app-arch/zstd dev-cpp/gflags:= dev-cpp/glog:= dev-libs/boost:=[nls?] - dev-libs/lzo:2= $(python_gen_cond_dep ' dev-python/cattrs[${PYTHON_USEDEP}] dev-python/cython[${PYTHON_USEDEP}] @@ -112,20 +112,19 @@ RDEPEND="${PYTHON_DEPS} dev-python/requests[${PYTHON_USEDEP}] dev-python/zstandard[${PYTHON_USEDEP}] ') - media-libs/freetype:=[brotli] + >=media-libs/freetype-2.13.3:=[brotli] media-libs/libepoxy:= media-libs/libjpeg-turbo:= - media-libs/libpng:= + >=media-libs/libpng-1.6.50:= media-libs/libsamplerate - >=media-libs/openimageio-3.0.6.1:= + >=media-libs/openimageio-3.0.9.1:= virtual/glu virtual/libintl virtual/opengl[X?] virtual/zlib:= alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) bullet? ( sci-physics/bullet:=[double-precision] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( media-libs/opencolorio:= ) + color-management? ( >=media-libs/opencolorio-2.4.2:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( media-libs/embree:=[raymask] ) ffmpeg? ( media-video/ffmpeg:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] ) @@ -133,15 +132,15 @@ RDEPEND="${PYTHON_DEPS} gmp? ( dev-libs/gmp:=[cxx] ) gnome? ( gui-libs/libdecor ) hip? ( - >=dev-util/hip-5.7:= + >=dev-util/hip-6.0:= hiprt? ( dev-libs/hiprt:2.5= ) ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - manifold? ( >=sci-mathematics/manifold-3.1.0:= ) + jpeg2k? ( >=media-libs/openjpeg-2.5.3:2= ) + manifold? ( >=sci-mathematics/manifold-3.2.1:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav @@ -151,7 +150,7 @@ RDEPEND="${PYTHON_DEPS} oidn? ( >=media-libs/oidn-2.1.0:= ) openexr? ( >=dev-libs/imath-3.1.7:= - >=media-libs/openexr-3.2.1:0= + >=media-libs/openexr-3.3.5:0= ) openpgl? ( media-libs/openpgl:= ) opensubdiv? ( >=media-libs/opensubdiv-3.6.0-r2:=[opengl,cuda?,tbb?] ) @@ -166,21 +165,22 @@ RDEPEND="${PYTHON_DEPS} ) ) osl? ( - >=media-libs/osl-1.14:=[${LLVM_USEDEP}] + >=media-libs/osl-1.14.7.0:=[${LLVM_USEDEP}] media-libs/mesa[${LLVM_USEDEP}] ) - pdf? ( media-libs/libharu:= ) pipewire? ( >=media-video/pipewire-1.1.0:= ) + pdf? ( >=media-libs/libharu-2.4.5:= ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-libs/libpulse ) + rubberband? ( >=media-libs/rubberband-4.0.0:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff:= ) valgrind? ( dev-debug/valgrind ) wayland? ( - >=dev-libs/wayland-1.12 + >=dev-libs/wayland-1.24.0 >=dev-libs/wayland-protocols-1.15 >=x11-libs/libxkbcommon-0.2.0 dev-util/wayland-scanner @@ -258,9 +258,6 @@ PATCHES=( "${FILESDIR}/${PN}-4.1.1-FindLLVM.patch" "${FILESDIR}/${PN}-4.1.1-numpy.patch" "${FILESDIR}/${PN}-4.3.2-system-glog.patch" - "${FILESDIR}/${PN}-4.5.0-ffmpeg-8.0.patch" - "${FILESDIR}/${PN}-4.5.3-cmake-policy-3.10.patch" - "${FILESDIR}/${PN}-9999-don-t-show-variable-names.patch" ) blender_check_requirements() { @@ -392,12 +389,6 @@ src_prepare() { -i "build_files/cmake/testing.cmake" \ || die "REPLACE.*TEST_INSTALL_DIR" - # assertEquals was deprecated in Python-3.2 use assertEqual instead - sed \ - -e 's/assertEquals/assertEqual/g' \ - -i tests/python/bl_animation_action.py \ - || die - sed -e '1i #include <cstdint>' -i extern/gtest/src/gtest-death-test.cc || die else cmake_comment_add_subdirectory tests @@ -449,7 +440,6 @@ src_configure() { -DWITH_MANIFOLD="$(usex manifold)" -DWITH_MATERIALX="no" # TODO: Package MaterialX -DWITH_NANOVDB="$(usex nanovdb)" - -DWITH_OPENCOLLADA="$(usex collada)" -DWITH_OPENCOLORIO="$(usex color-management)" -DWITH_OPENGL_BACKEND="$(usex opengl)" -DWITH_OPENIMAGEDENOISE="$(usex oidn)" @@ -463,7 +453,7 @@ src_configure() { -DWITH_TBB="$(usex tbb)" -DWITH_UNITY_BUILD="no" -DWITH_USD="no" # TODO: Package USD - -DWITH_VULKAN_BACKEND="$(usex vulkan)" # experimental + -DWITH_VULKAN_BACKEND="$(usex vulkan)" -DWITH_XR_OPENXR="no" -DWITH_SYSTEM_BULLET="yes" @@ -471,7 +461,6 @@ src_configure() { -DWITH_SYSTEM_FREETYPE="yes" -DWITH_SYSTEM_GFLAGS="yes" -DWITH_SYSTEM_GLOG="yes" - -DWITH_SYSTEM_LZO="yes" # Compiler Options: # -DWITH_BUILDINFO="yes" @@ -538,7 +527,6 @@ src_configure() { -DWITH_CYCLES_OSL="$(usex osl)" -DWITH_CYCLES_EMBREE="$(usex embree)" -DWITH_CYCLES_PATH_GUIDING="$(usex openpgl)" - -DWITH_CYCLES_LOGGING="ON" # "$(usex debug)" -DWITH_CYCLES_DEVICE_OPTIX="$(usex optix)" -DWITH_CYCLES_DEVICE_CUDA="$(usex cuda)" @@ -564,10 +552,9 @@ src_configure() { # -DWITH_INPUT_IME=ON # -DWITH_LIBMV=ON # -DWITH_LIBMV_SCHUR_SPECIALIZATIONS=ON - # -DWITH_LZMA=ON - # -DWITH_LZO=ON # -DWITH_UV_SLIM=ON - -DWITH_NINJA_POOL_JOBS="no" + -DWITH_NINJA_POOL_JOBS="yes" + -DWITH_RUBBERBAND="$(usex rubberband)" # -DPOSTINSTALL_SCRIPT:PATH="" # -DPOSTCONFIGURE_SCRIPT:PATH="" ) diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index 467a83667254..bfd8344bdb33 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -20,7 +20,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..13} ) # NOTE must match media-libs/osl -LLVM_COMPAT=( {18..20} ) +LLVM_COMPAT=( {20..20} ) LLVM_OPTIONAL=1 ROCM_SKIP_GLOBALS=1 @@ -65,11 +65,11 @@ SLOT="${BLENDER_BRANCH}" # NOTE +openpgl breaks on very old amd64 hardware # potentially mirror cpu_flags_x86 + REQUIRED_USE IUSE=" - alembic +bullet collada +color-management cuda +cycles +cycles-bin-kernels + alembic +bullet +color-management cuda +cycles +cycles-bin-kernels debug doc +embree +ffmpeg +fftw +fluid +gmp gnome hip hiprt jack jemalloc jpeg2k man +manifold +nanovdb ndof nls +oidn openal +openexr +opengl +openpgl +opensubdiv +openvdb optix osl pipewire +pdf +potrace +pugixml pulseaudio - renderdoc sdl +sndfile +tbb test +tiff +truetype valgrind vulkan wayland +webp X + renderdoc +rubberband sdl +sndfile +tbb test +tiff +truetype valgrind vulkan wayland +webp X " if [[ "${PV}" == *9999* ]]; then @@ -99,12 +99,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} # Library versions for official builds can be found in the blender source directory in: # build_files/build_environment/cmake/versions.cmake + RDEPEND="${PYTHON_DEPS} app-arch/zstd dev-cpp/gflags:= dev-cpp/glog:= dev-libs/boost:=[nls?] - dev-libs/lzo:2= $(python_gen_cond_dep ' dev-python/cattrs[${PYTHON_USEDEP}] dev-python/cython[${PYTHON_USEDEP}] @@ -112,20 +112,19 @@ RDEPEND="${PYTHON_DEPS} dev-python/requests[${PYTHON_USEDEP}] dev-python/zstandard[${PYTHON_USEDEP}] ') - media-libs/freetype:=[brotli] + >=media-libs/freetype-2.13.3:=[brotli] media-libs/libepoxy:= media-libs/libjpeg-turbo:= - media-libs/libpng:= + >=media-libs/libpng-1.6.50:= media-libs/libsamplerate - >=media-libs/openimageio-3.0.6.1:= + >=media-libs/openimageio-3.0.9.1:= virtual/glu virtual/libintl virtual/opengl[X?] virtual/zlib:= alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] ) bullet? ( sci-physics/bullet:=[double-precision] ) - collada? ( >=media-libs/opencollada-1.6.68 ) - color-management? ( media-libs/opencolorio:= ) + color-management? ( >=media-libs/opencolorio-2.4.2:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( media-libs/embree:=[raymask] ) ffmpeg? ( media-video/ffmpeg:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] ) @@ -133,15 +132,15 @@ RDEPEND="${PYTHON_DEPS} gmp? ( dev-libs/gmp:=[cxx] ) gnome? ( gui-libs/libdecor ) hip? ( - >=dev-util/hip-5.7:= + >=dev-util/hip-6.0:= hiprt? ( dev-libs/hiprt:2.5= ) ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - manifold? ( >=sci-mathematics/manifold-3.1.0:= ) + jpeg2k? ( >=media-libs/openjpeg-2.5.3:2= ) + manifold? ( >=sci-mathematics/manifold-3.2.1:= ) ndof? ( app-misc/spacenavd dev-libs/libspnav @@ -151,7 +150,7 @@ RDEPEND="${PYTHON_DEPS} oidn? ( >=media-libs/oidn-2.1.0:= ) openexr? ( >=dev-libs/imath-3.1.7:= - >=media-libs/openexr-3.2.1:0= + >=media-libs/openexr-3.3.5:0= ) openpgl? ( media-libs/openpgl:= ) opensubdiv? ( >=media-libs/opensubdiv-3.6.0-r2:=[opengl,cuda?,tbb?] ) @@ -166,21 +165,22 @@ RDEPEND="${PYTHON_DEPS} ) ) osl? ( - >=media-libs/osl-1.14:=[${LLVM_USEDEP}] + >=media-libs/osl-1.14.7.0:=[${LLVM_USEDEP}] media-libs/mesa[${LLVM_USEDEP}] ) - pdf? ( media-libs/libharu:= ) pipewire? ( >=media-video/pipewire-1.1.0:= ) + pdf? ( >=media-libs/libharu-2.4.5:= ) potrace? ( media-gfx/potrace ) pugixml? ( dev-libs/pugixml ) pulseaudio? ( media-libs/libpulse ) + rubberband? ( >=media-libs/rubberband-4.0.0:= ) sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb:= ) tiff? ( media-libs/tiff:= ) valgrind? ( dev-debug/valgrind ) wayland? ( - >=dev-libs/wayland-1.12 + >=dev-libs/wayland-1.24.0 >=dev-libs/wayland-protocols-1.15 >=x11-libs/libxkbcommon-0.2.0 dev-util/wayland-scanner @@ -258,9 +258,6 @@ PATCHES=( "${FILESDIR}/${PN}-4.1.1-FindLLVM.patch" "${FILESDIR}/${PN}-4.1.1-numpy.patch" "${FILESDIR}/${PN}-4.3.2-system-glog.patch" - "${FILESDIR}/${PN}-4.5.0-ffmpeg-8.0.patch" - "${FILESDIR}/${PN}-4.5.3-cmake-policy-3.10.patch" - "${FILESDIR}/${PN}-9999-don-t-show-variable-names.patch" ) blender_check_requirements() { @@ -392,12 +389,6 @@ src_prepare() { -i "build_files/cmake/testing.cmake" \ || die "REPLACE.*TEST_INSTALL_DIR" - # assertEquals was deprecated in Python-3.2 use assertEqual instead - sed \ - -e 's/assertEquals/assertEqual/g' \ - -i tests/python/bl_animation_action.py \ - || die - sed -e '1i #include <cstdint>' -i extern/gtest/src/gtest-death-test.cc || die else cmake_comment_add_subdirectory tests @@ -449,7 +440,6 @@ src_configure() { -DWITH_MANIFOLD="$(usex manifold)" -DWITH_MATERIALX="no" # TODO: Package MaterialX -DWITH_NANOVDB="$(usex nanovdb)" - -DWITH_OPENCOLLADA="$(usex collada)" -DWITH_OPENCOLORIO="$(usex color-management)" -DWITH_OPENGL_BACKEND="$(usex opengl)" -DWITH_OPENIMAGEDENOISE="$(usex oidn)" @@ -463,7 +453,7 @@ src_configure() { -DWITH_TBB="$(usex tbb)" -DWITH_UNITY_BUILD="no" -DWITH_USD="no" # TODO: Package USD - -DWITH_VULKAN_BACKEND="$(usex vulkan)" # experimental + -DWITH_VULKAN_BACKEND="$(usex vulkan)" -DWITH_XR_OPENXR="no" -DWITH_SYSTEM_BULLET="yes" @@ -471,7 +461,6 @@ src_configure() { -DWITH_SYSTEM_FREETYPE="yes" -DWITH_SYSTEM_GFLAGS="yes" -DWITH_SYSTEM_GLOG="yes" - -DWITH_SYSTEM_LZO="yes" # Compiler Options: # -DWITH_BUILDINFO="yes" @@ -564,10 +553,9 @@ src_configure() { # -DWITH_INPUT_IME=ON # -DWITH_LIBMV=ON # -DWITH_LIBMV_SCHUR_SPECIALIZATIONS=ON - # -DWITH_LZMA=ON - # -DWITH_LZO=ON # -DWITH_UV_SLIM=ON - -DWITH_NINJA_POOL_JOBS="no" + -DWITH_NINJA_POOL_JOBS="yes" + -DWITH_RUBBERBAND="$(usex rubberband)" # -DPOSTINSTALL_SCRIPT:PATH="" # -DPOSTCONFIGURE_SCRIPT:PATH="" ) diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index f4e8a4fed5e8..6b2660f5249b 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -92,11 +92,17 @@ <flag name="renderdoc"> Build Blender with renderdoc support </flag> + <flag name="rubberband"> + Build with Rubber Band for audio time-stretching and pitch-scaling (used by Audaspace) via <pkg>media-libs/rubberband</pkg> + </flag> <flag name="tbb"> Use threading building blocks library from <pkg>dev-cpp/tbb</pkg>. </flag> - <flag name="vulkan"> + <flag name="vulkan" restrict="<media-gfx/blender-5"> Add support for the experimental Vulkan viewport backend </flag> + <flag name="vulkan" restrict=">=media-gfx/blender-5"> + Add support for the Vulkan viewport backend + </flag> </use> </pkgmetadata>
