media-libs/blender: change depends for OpenVDB 5.x compat

Only v2.79b and above will be compatible with OpenVDB 5.x, so
make sure previous versions depend on OpenVDB 4.x.

Change depend on ffmpeg because v4.x is not supported.
Closes: https://bugs.gentoo.org/655030
Closes: https://github.com/gentoo/gentoo/pull/9580

diff --git a/media-gfx/blender/blender-2.79-r1.ebuild b/media-gfx/blender/blender-2.79-r1.ebuild
index 588dd53d6067fe3ff3fa4b579f32dfece8c28385..2db487bd238b77f800a8d797cee9342c3ad3ab01 100644 (file)
--- a/media-gfx/blender/blender-2.79-r1.ebuild
+++ b/media-gfx/blender/blender-2.79-r1.ebuild
@@ -48,7 +48,7 @@ RDEPEND="${PYTHON_DEPS}
        collada? ( >=media-libs/opencollada-1.6.18:= )
        colorio? ( media-libs/opencolorio )
        cuda? ( dev-util/nvidia-cuda-toolkit:= )
-       ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+       ffmpeg? ( <media-video/ffmpeg-4.0:=[x264,mp3,encode,theora,jpeg2k?] )
        libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
        fftw? ( sci-libs/fftw:3.0= )
        !headless? (
@@ -74,7 +74,7 @@ RDEPEND="${PYTHON_DEPS}
        )
        opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
        openvdb? (
-               media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)]
+               <media-gfx/openvdb-5.0.0:=[${PYTHON_USEDEP},abi3-compat]
                dev-cpp/tbb
                >=dev-libs/c-blosc-1.5.2
        )

diff --git a/media-gfx/blender/blender-2.79.ebuild b/media-gfx/blender/blender-2.79.ebuild
index 145205ce35b870bd65b095f796c1df268be7b335..7a99f994dd2fc4479ba62e0f3ae419f76a5489e7 100644 (file)
--- a/media-gfx/blender/blender-2.79.ebuild
+++ b/media-gfx/blender/blender-2.79.ebuild
@@ -48,7 +48,7 @@ RDEPEND="${PYTHON_DEPS}
        collada? ( >=media-libs/opencollada-1.6.18:= )
        colorio? ( media-libs/opencolorio )
        cuda? ( dev-util/nvidia-cuda-toolkit:= )
-       ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+       ffmpeg? ( <media-video/ffmpeg-4.0:=[x264,mp3,encode,theora,jpeg2k?] )
        libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
        fftw? ( sci-libs/fftw:3.0= )
        !headless? (
@@ -74,7 +74,7 @@ RDEPEND="${PYTHON_DEPS}
        )
        opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
        openvdb? (
-               media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)]
+               <media-gfx/openvdb-5.0.0:=[${PYTHON_USEDEP},abi3-compat]
                dev-cpp/tbb
                >=dev-libs/c-blosc-1.5.2
        )