[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/

["Jonathan Scruggs" <dracwyrm@gentoo.org>]

commit:     f76dac14be61f812f1b2eb759f40c3dad9211ad2
Author:     Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Wed Aug 15 16:43:27 2018 +0000
Commit:     Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 17:20:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f76dac14

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

 media-gfx/blender/blender-2.79-r1.ebuild | 4 ++--
 media-gfx/blender/blender-2.79.ebuild    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/blender/blender-2.79-r1.ebuild b/media-gfx/blender/blender-2.79-r1.ebuild
index 588dd53d606..2db487bd238 100644
--- 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 145205ce35b..7a99f994dd2 100644
--- 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
 	)