commit: 2063bc44cafd949eb5a05ac1060684afc82e04b4 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Apr 17 06:33:01 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Apr 17 06:44:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2063bc44
media-gfx/blender: restrict old slots to <ffmpeg-7 Would rather not have to test fixes for these old slots myself nor attempt to migrate to ffmpeg-compat, and given they are due for removal anyway may as well just add upper bounds meanwhile just so it won't cause trouble even if we stable ffmpeg-7. wrt bug #953827, sounds like stabling a fixed slot may take time so doing this will make it non-urgent. Can skip revbumps (long rebuild) given ffmpeg-7 will attempt to trigger rebuilds and then portage will see the upper bound and skip it. Bug: https://bugs.gentoo.org/951199 Bug: https://bugs.gentoo.org/953827 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-gfx/blender/blender-3.6.18-r1.ebuild | 2 +- media-gfx/blender/blender-4.1.1-r5.ebuild | 2 +- media-gfx/blender/blender-4.2.4-r2.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media-gfx/blender/blender-3.6.18-r1.ebuild b/media-gfx/blender/blender-3.6.18-r1.ebuild index c5e81c940568..1d012d0577cc 100644 --- a/media-gfx/blender/blender-3.6.18-r1.ebuild +++ b/media-gfx/blender/blender-3.6.18-r1.ebuild @@ -69,7 +69,7 @@ RDEPEND="${PYTHON_DEPS} color-management? ( media-libs/opencolorio:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( >=media-libs/embree-3.10.0:=[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] ) + ffmpeg? ( <media-video/ffmpeg-7:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp[cxx] ) jack? ( virtual/jack ) diff --git a/media-gfx/blender/blender-4.1.1-r5.ebuild b/media-gfx/blender/blender-4.1.1-r5.ebuild index 81c48ef32a60..37551c00853a 100644 --- a/media-gfx/blender/blender-4.1.1-r5.ebuild +++ b/media-gfx/blender/blender-4.1.1-r5.ebuild @@ -82,7 +82,7 @@ RDEPEND="${PYTHON_DEPS} color-management? ( media-libs/opencolorio:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( media-libs/embree:=[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] ) + ffmpeg? ( <media-video/ffmpeg-7:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp[cxx] ) gnome? ( gui-libs/libdecor ) diff --git a/media-gfx/blender/blender-4.2.4-r2.ebuild b/media-gfx/blender/blender-4.2.4-r2.ebuild index 9b5a6db08f0a..80d0f8b1a07c 100644 --- a/media-gfx/blender/blender-4.2.4-r2.ebuild +++ b/media-gfx/blender/blender-4.2.4-r2.ebuild @@ -81,7 +81,7 @@ RDEPEND="${PYTHON_DEPS} color-management? ( media-libs/opencolorio:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( media-libs/embree:=[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] ) + ffmpeg? ( <media-video/ffmpeg-7:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp[cxx] ) gnome? ( gui-libs/libdecor )
