From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1572437-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id AE0FC158099
	for <garchives@archives.gentoo.org>; Thu, 23 Nov 2023 08:16:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id DFBD32BC020;
	Thu, 23 Nov 2023 08:16:35 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 pigeon.gentoo.org (Postfix) with ESMTPS id C470F2BC020
	for <gentoo-commits@lists.gentoo.org>; Thu, 23 Nov 2023 08:16:35 +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) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 05F9333BE3B
	for <gentoo-commits@lists.gentoo.org>; Thu, 23 Nov 2023 08:16:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 50EAB13BC
	for <gentoo-commits@lists.gentoo.org>; Thu, 23 Nov 2023 08:16:33 +0000 (UTC)
From: "Ionen Wolkens" <ionen@gentoo.org>
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" <ionen@gentoo.org>
Message-ID: <1700727115.1a7a4c504ad981e8d6b7b6d80738796c48152f14.ionen@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-video/ffmpeg/ffmpeg-4.4.4-r6.ebuild media-video/ffmpeg/ffmpeg-4.4.4-r7.ebuild media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild media-video/ffmpeg/ffmpeg-5.1.3-r5.ebuild media-video/ffmpeg/ffmpeg-5.1.4-r1.ebuild media-video/ffmpeg/ffmpeg-5.1.4.ebuild media-video/ffmpeg/ffmpeg-6.0-r10.ebuild media-video/ffmpeg/ffmpeg-6.0-r9.ebuild media-video/ffmpeg/ffmpeg-6.0.1.ebuild media-video/ffmpeg/ffmpeg-6.1.ebuild media-video/ffmpeg/ffmpeg-9999.ebuild
X-VCS-Directories: media-video/ffmpeg/
X-VCS-Committer: ionen
X-VCS-Committer-Name: Ionen Wolkens
X-VCS-Revision: 1a7a4c504ad981e8d6b7b6d80738796c48152f14
X-VCS-Branch: master
Date: Thu, 23 Nov 2023 08:16:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 2cbc207b-3695-4afc-a0b8-2602a458b2ec
X-Archives-Hash: cac58563fe437bdc18bb3d9ab5bd1a79

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}]