| 1 |
commit: f76dac14be61f812f1b2eb759f40c3dad9211ad2 |
| 2 |
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Aug 15 16:43:27 2018 +0000 |
| 4 |
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 15 17:20:47 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f76dac14 |
| 7 |
|
| 8 |
media-libs/blender: change depends for OpenVDB 5.x compat |
| 9 |
|
| 10 |
Only v2.79b and above will be compatible with OpenVDB 5.x, so |
| 11 |
make sure previous versions depend on OpenVDB 4.x. |
| 12 |
|
| 13 |
Change depend on ffmpeg because v4.x is not supported. |
| 14 |
Closes: https://bugs.gentoo.org/655030 |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/9580 |
| 16 |
|
| 17 |
media-gfx/blender/blender-2.79-r1.ebuild | 4 ++-- |
| 18 |
media-gfx/blender/blender-2.79.ebuild | 4 ++-- |
| 19 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-gfx/blender/blender-2.79-r1.ebuild b/media-gfx/blender/blender-2.79-r1.ebuild |
| 22 |
index 588dd53d606..2db487bd238 100644 |
| 23 |
--- a/media-gfx/blender/blender-2.79-r1.ebuild |
| 24 |
+++ b/media-gfx/blender/blender-2.79-r1.ebuild |
| 25 |
@@ -48,7 +48,7 @@ RDEPEND="${PYTHON_DEPS} |
| 26 |
collada? ( >=media-libs/opencollada-1.6.18:= ) |
| 27 |
colorio? ( media-libs/opencolorio ) |
| 28 |
cuda? ( dev-util/nvidia-cuda-toolkit:= ) |
| 29 |
- ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) |
| 30 |
+ ffmpeg? ( <media-video/ffmpeg-4.0:=[x264,mp3,encode,theora,jpeg2k?] ) |
| 31 |
libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) |
| 32 |
fftw? ( sci-libs/fftw:3.0= ) |
| 33 |
!headless? ( |
| 34 |
@@ -74,7 +74,7 @@ RDEPEND="${PYTHON_DEPS} |
| 35 |
) |
| 36 |
opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) |
| 37 |
openvdb? ( |
| 38 |
- media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)] |
| 39 |
+ <media-gfx/openvdb-5.0.0:=[${PYTHON_USEDEP},abi3-compat] |
| 40 |
dev-cpp/tbb |
| 41 |
>=dev-libs/c-blosc-1.5.2 |
| 42 |
) |
| 43 |
|
| 44 |
diff --git a/media-gfx/blender/blender-2.79.ebuild b/media-gfx/blender/blender-2.79.ebuild |
| 45 |
index 145205ce35b..7a99f994dd2 100644 |
| 46 |
--- a/media-gfx/blender/blender-2.79.ebuild |
| 47 |
+++ b/media-gfx/blender/blender-2.79.ebuild |
| 48 |
@@ -48,7 +48,7 @@ RDEPEND="${PYTHON_DEPS} |
| 49 |
collada? ( >=media-libs/opencollada-1.6.18:= ) |
| 50 |
colorio? ( media-libs/opencolorio ) |
| 51 |
cuda? ( dev-util/nvidia-cuda-toolkit:= ) |
| 52 |
- ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) |
| 53 |
+ ffmpeg? ( <media-video/ffmpeg-4.0:=[x264,mp3,encode,theora,jpeg2k?] ) |
| 54 |
libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) |
| 55 |
fftw? ( sci-libs/fftw:3.0= ) |
| 56 |
!headless? ( |
| 57 |
@@ -74,7 +74,7 @@ RDEPEND="${PYTHON_DEPS} |
| 58 |
) |
| 59 |
opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) |
| 60 |
openvdb? ( |
| 61 |
- media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)] |
| 62 |
+ <media-gfx/openvdb-5.0.0:=[${PYTHON_USEDEP},abi3-compat] |
| 63 |
dev-cpp/tbb |
| 64 |
>=dev-libs/c-blosc-1.5.2 |
| 65 |
) |
Archives