From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DBE801582EF for ; Tue, 11 Mar 2025 09:04:23 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id C2283343118 for ; Tue, 11 Mar 2025 09:04:23 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id F0E2D1103E2; Tue, 11 Mar 2025 09:04:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id DDB4B1103CE for ; Tue, 11 Mar 2025 09:04:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B16A34314B for ; Tue, 11 Mar 2025 09:04:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B0DC28E3 for ; Tue, 11 Mar 2025 09:04:06 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1741683800.b9a6a6fb706d4f69c15812ab4aa355cabbec790d.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/blender/blender-3.6.15-r1.ebuild media-gfx/blender/blender-3.6.15.ebuild media-gfx/blender/blender-3.6.18-r1.ebuild media-gfx/blender/blender-3.6.18.ebuild media-gfx/blender/blender-3.6.8-r1.ebuild media-gfx/blender/blender-3.6.8.ebuild media-gfx/blender/blender-4.1.1-r2.ebuild media-gfx/blender/blender-4.1.1-r3.ebuild media-gfx/blender/blender-4.1.1-r4.ebuild media-gfx/blender/blender-4.1.1.ebuild media-gfx/blender/blender-4.2.1-r1.ebuild media-gfx/blender/blender-4.2.1.ebuild media-gfx/blender/blender-4.2.4-r1.ebuild media-gfx/blender/blender-4.2.4.ebuild media-gfx/blender/blender-4.3.2-r1.ebuild media-gfx/blender/blender-4.3.2.ebuild media-gfx/blender/blender-9999.ebuild X-VCS-Directories: media-gfx/blender/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: b9a6a6fb706d4f69c15812ab4aa355cabbec790d X-VCS-Branch: master Date: Tue, 11 Mar 2025 09:04:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8350ea58-c859-4365-b7f6-2bbad8d7d4e4 X-Archives-Hash: f519f6fa128ee8769f572ba19814f403 commit: b9a6a6fb706d4f69c15812ab4aa355cabbec790d Author: Ionen Wolkens gentoo org> AuthorDate: Mon Mar 10 06:28:46 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Mar 11 09:03:20 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9a6a6fb 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 gentoo.org> .../blender/{blender-3.6.18.ebuild => blender-3.6.15-r1.ebuild} | 5 ++++- .../blender/{blender-3.6.15.ebuild => blender-3.6.18-r1.ebuild} | 7 +++++-- .../blender/{blender-3.6.8.ebuild => blender-3.6.8-r1.ebuild} | 7 +++++-- .../blender/{blender-4.1.1.ebuild => blender-4.1.1-r3.ebuild} | 7 +++++-- .../blender/{blender-4.1.1-r2.ebuild => blender-4.1.1-r4.ebuild} | 5 ++++- .../blender/{blender-4.2.1.ebuild => blender-4.2.1-r1.ebuild} | 5 ++++- .../blender/{blender-4.2.4.ebuild => blender-4.2.4-r1.ebuild} | 5 ++++- .../blender/{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(-) 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 bdf6973efd45..b2b0c67be6c0 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 8780d66cc455..b2b0c67be6c0 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 f127201b747a..24171b70d5a7 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 66f6aa0684a0..12c75c6e0dcf 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 fb05122a58e1..6498f3f3abcc 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 c58782732586..fc0bfc69fa26 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 7d8618e63bae..c6813514bc00 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 c5735ca5f00f..8e849ba27514 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 47a316667ba0..6304da04d1cb 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 )