commit: 1a7a4c504ad981e8d6b7b6d80738796c48152f14 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Nov 23 07:32:52 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Nov 23 08:11:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a7a4c50
media-video/ffmpeg: update nv-codec-headers version requirements ffmpeg-4, 5, and 6.0: Building against nv-codec-headers-12 *works* but then nvenc is unusable at runtime. ffmpeg-6.0.1: Any in-tree version seems fine. >=ffmpeg-6.1: Requires >=11.1.5.3 wrt bug #917765 (mpv is fine with -12 as well, but have not tested other consumers). No need for revbumps, technically this shouldn't be in RDEPEND but not going to re-arrange things more than necessary. Closes: https://bugs.gentoo.org/917765 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild | 2 +- media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild | 2 +- media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild | 2 +- media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild | 2 +- media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-5.1.4.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0-r10.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0-r9.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.0.1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-6.1.ebuild | 2 +- media-video/ffmpeg/ffmpeg-9999.ebuild | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild index 57679511d8c1..6645a2cf80b4 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild @@ -261,7 +261,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( <media-libs/nv-codec-headers-12 ) svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild index ddefa61892eb..f58a29fe1bc4 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild @@ -263,7 +263,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( <media-libs/nv-codec-headers-12 ) svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild index 8cdd98613c21..19f8a2283312 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild @@ -264,7 +264,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( <media-libs/nv-codec-headers-12 ) svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild b/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild index 3eee659198b1..26bb3186e662 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild @@ -267,7 +267,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( <media-libs/nv-codec-headers-12 ) svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild index 255803ae6dee..39d9265358be 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild @@ -269,7 +269,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( <media-libs/nv-codec-headers-12 ) svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-5.1.4.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4.ebuild index ce56738559ae..dc24b0c54150 100644 --- a/media-video/ffmpeg/ffmpeg-5.1.4.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.1.4.ebuild @@ -267,7 +267,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( <media-libs/nv-codec-headers-12 ) svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild index d00189a64794..c1788e15f04e 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r10.ebuild @@ -267,7 +267,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( <media-libs/nv-codec-headers-12 ) svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild index 97928dcfec5f..07b8381bfe45 100644 --- a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild @@ -265,7 +265,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( <media-libs/nv-codec-headers-12 ) svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild index d3df5f91a1e6..7a382e4aeebd 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1.ebuild @@ -267,7 +267,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( media-libs/nv-codec-headers ) svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) diff --git a/media-video/ffmpeg/ffmpeg-6.1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.ebuild index bd944e4eb312..992b5f8baa39 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.ebuild @@ -269,7 +269,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index bd944e4eb312..992b5f8baa39 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -269,7 +269,7 @@ RDEPEND=" gnome-base/librsvg:2=[${MULTILIB_USEDEP}] x11-libs/cairo[${MULTILIB_USEDEP}] ) - nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
