From b9a6a6fb706d4f69c15812ab4aa355cabbec790d Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Mon, 10 Mar 2025 02:28:46 -0400 Subject: [PATCH] media-gfx/blender: update ffmpeg usedeps Don't really like having to revbump blender over this, but it's better than users running into conflicts. The || ( lame mp3 ) will be replaced later by just [lame(-)] which can be done without another revbump. ... that aside, can some of these versions be dropped? Signed-off-by: Ionen Wolkens --- .../{blender-3.6.18.ebuild => blender-3.6.15-r1.ebuild} | 5 ++++- .../{blender-3.6.15.ebuild => blender-3.6.18-r1.ebuild} | 7 +++++-- .../{blender-3.6.8.ebuild => blender-3.6.8-r1.ebuild} | 7 +++++-- .../{blender-4.1.1.ebuild => blender-4.1.1-r3.ebuild} | 7 +++++-- .../{blender-4.1.1-r2.ebuild => blender-4.1.1-r4.ebuild} | 5 ++++- .../{blender-4.2.1.ebuild => blender-4.2.1-r1.ebuild} | 5 ++++- .../{blender-4.2.4.ebuild => blender-4.2.4-r1.ebuild} | 5 ++++- .../{blender-4.3.2.ebuild => blender-4.3.2-r1.ebuild} | 5 ++++- media-gfx/blender/blender-9999.ebuild | 5 ++++- 9 files changed, 39 insertions(+), 12 deletions(-) rename media-gfx/blender/{blender-3.6.18.ebuild => blender-3.6.15-r1.ebuild} (98%) rename media-gfx/blender/{blender-3.6.15.ebuild => blender-3.6.18-r1.ebuild} (98%) rename media-gfx/blender/{blender-3.6.8.ebuild => blender-3.6.8-r1.ebuild} (98%) rename media-gfx/blender/{blender-4.1.1.ebuild => blender-4.1.1-r3.ebuild} (98%) rename media-gfx/blender/{blender-4.1.1-r2.ebuild => blender-4.1.1-r4.ebuild} (99%) rename media-gfx/blender/{blender-4.2.1.ebuild => blender-4.2.1-r1.ebuild} (99%) rename media-gfx/blender/{blender-4.2.4.ebuild => blender-4.2.4-r1.ebuild} (99%) rename media-gfx/blender/{blender-4.3.2.ebuild => blender-4.3.2-r1.ebuild} (99%) diff --git a/media-gfx/blender/blender-3.6.18.ebuild b/media-gfx/blender/blender-3.6.15-r1.ebuild similarity index 98% rename from media-gfx/blender/blender-3.6.18.ebuild rename to media-gfx/blender/blender-3.6.15-r1.ebuild index bdf6973efd455..b2b0c67be6c0b 100644 --- a/media-gfx/blender/blender-3.6.18.ebuild +++ b/media-gfx/blender/blender-3.6.15-r1.ebuild @@ -69,7 +69,10 @@ 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:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) + ffmpeg? ( + media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] + || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] ) + ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp[cxx] ) jack? ( virtual/jack ) diff --git a/media-gfx/blender/blender-3.6.15.ebuild b/media-gfx/blender/blender-3.6.18-r1.ebuild similarity index 98% rename from media-gfx/blender/blender-3.6.15.ebuild rename to media-gfx/blender/blender-3.6.18-r1.ebuild index 8780d66cc455c..b2b0c67be6c0b 100644 --- a/media-gfx/blender/blender-3.6.15.ebuild +++ b/media-gfx/blender/blender-3.6.18-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -69,7 +69,10 @@ 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:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) + ffmpeg? ( + media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] + || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] ) + ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp[cxx] ) jack? ( virtual/jack ) diff --git a/media-gfx/blender/blender-3.6.8.ebuild b/media-gfx/blender/blender-3.6.8-r1.ebuild similarity index 98% rename from media-gfx/blender/blender-3.6.8.ebuild rename to media-gfx/blender/blender-3.6.8-r1.ebuild index f127201b747a8..24171b70d5a77 100644 --- a/media-gfx/blender/blender-3.6.8.ebuild +++ b/media-gfx/blender/blender-3.6.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -69,7 +69,10 @@ 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:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) + ffmpeg? ( + media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] + || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] ) + ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) jack? ( virtual/jack ) diff --git a/media-gfx/blender/blender-4.1.1.ebuild b/media-gfx/blender/blender-4.1.1-r3.ebuild similarity index 98% rename from media-gfx/blender/blender-4.1.1.ebuild rename to media-gfx/blender/blender-4.1.1-r3.ebuild index 66f6aa0684a08..12c75c6e0dcfd 100644 --- a/media-gfx/blender/blender-4.1.1.ebuild +++ b/media-gfx/blender/blender-4.1.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -81,7 +81,10 @@ RDEPEND="${PYTHON_DEPS} color-management? ( media-libs/opencolorio:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( media-libs/embree:=[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) + ffmpeg? ( + media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] + || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] ) + ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) gnome? ( gui-libs/libdecor ) diff --git a/media-gfx/blender/blender-4.1.1-r2.ebuild b/media-gfx/blender/blender-4.1.1-r4.ebuild similarity index 99% rename from media-gfx/blender/blender-4.1.1-r2.ebuild rename to media-gfx/blender/blender-4.1.1-r4.ebuild index fb05122a58e1c..6498f3f3abccf 100644 --- a/media-gfx/blender/blender-4.1.1-r2.ebuild +++ b/media-gfx/blender/blender-4.1.1-r4.ebuild @@ -82,7 +82,10 @@ RDEPEND="${PYTHON_DEPS} color-management? ( media-libs/opencolorio:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( media-libs/embree:=[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) + ffmpeg? ( + media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] + || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] ) + ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp[cxx] ) gnome? ( gui-libs/libdecor ) diff --git a/media-gfx/blender/blender-4.2.1.ebuild b/media-gfx/blender/blender-4.2.1-r1.ebuild similarity index 99% rename from media-gfx/blender/blender-4.2.1.ebuild rename to media-gfx/blender/blender-4.2.1-r1.ebuild index c587827325869..fc0bfc69fa26d 100644 --- a/media-gfx/blender/blender-4.2.1.ebuild +++ b/media-gfx/blender/blender-4.2.1-r1.ebuild @@ -81,7 +81,10 @@ RDEPEND="${PYTHON_DEPS} color-management? ( media-libs/opencolorio:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( media-libs/embree:=[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) + ffmpeg? ( + media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] + || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] ) + ) 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.ebuild b/media-gfx/blender/blender-4.2.4-r1.ebuild similarity index 99% rename from media-gfx/blender/blender-4.2.4.ebuild rename to media-gfx/blender/blender-4.2.4-r1.ebuild index 7d8618e63bae2..c6813514bc005 100644 --- a/media-gfx/blender/blender-4.2.4.ebuild +++ b/media-gfx/blender/blender-4.2.4-r1.ebuild @@ -81,7 +81,10 @@ RDEPEND="${PYTHON_DEPS} color-management? ( media-libs/opencolorio:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( media-libs/embree:=[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) + ffmpeg? ( + media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] + || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] ) + ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp[cxx] ) gnome? ( gui-libs/libdecor ) diff --git a/media-gfx/blender/blender-4.3.2.ebuild b/media-gfx/blender/blender-4.3.2-r1.ebuild similarity index 99% rename from media-gfx/blender/blender-4.3.2.ebuild rename to media-gfx/blender/blender-4.3.2-r1.ebuild index c5735ca5f00f4..8e849ba275148 100644 --- a/media-gfx/blender/blender-4.3.2.ebuild +++ b/media-gfx/blender/blender-4.3.2-r1.ebuild @@ -81,7 +81,10 @@ RDEPEND="${PYTHON_DEPS} color-management? ( media-libs/opencolorio:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( media-libs/embree:=[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) + ffmpeg? ( + media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] + || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] ) + ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp[cxx] ) gnome? ( gui-libs/libdecor ) diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index 47a316667ba0f..6304da04d1cbd 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -81,7 +81,10 @@ RDEPEND="${PYTHON_DEPS} color-management? ( media-libs/opencolorio:= ) cuda? ( dev-util/nvidia-cuda-toolkit:= ) embree? ( media-libs/embree:=[raymask] ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] ) + ffmpeg? ( + media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid] + || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] ) + ) fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp[cxx] ) gnome? ( gui-libs/libdecor )