[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Ionen Wolkens]

commit:     46b6923f86b1f0695045425d9a869463834707fc
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  5 14:57:24 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Aug  5 15:44:48 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b6923f

media-video/ffmpeg: flatten patch names

This is needed to be able to copy to ffmpeg-compat, albeit ideally
they'll likely be moved to patchsets later to avoid duplicating patches
(just not going to make a new patchset for every new patches, and wait
to batch them).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-video/ffmpeg/ffmpeg-6.1.2-r3.ebuild | 2 +-
 media-video/ffmpeg/ffmpeg-7.1.1-r2.ebuild | 6 +++---
 media-video/ffmpeg/ffmpeg-9999.ebuild     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.2-r3.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.2-r3.ebuild
index e59ba33551ee..29eae7cb290a 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.2-r3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.2-r3.ebuild
@@ -331,7 +331,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
        "${WORKDIR}"/patches
-       "${FILESDIR}"/${PN}-7.1.1-npp13.patch
+       "${FILESDIR}"/ffmpeg-7.1.1-npp13.patch
 )
 
 pkg_pretend() {

diff --git a/media-video/ffmpeg/ffmpeg-7.1.1-r2.ebuild 
b/media-video/ffmpeg/ffmpeg-7.1.1-r2.ebuild
index e6bac31e2fc1..ea5fb10d2d3c 100644
--- a/media-video/ffmpeg/ffmpeg-7.1.1-r2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.1.1-r2.ebuild
@@ -340,9 +340,9 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch
-       "${FILESDIR}"/${PN}-7.1.1-svt-av1-3.patch
-       "${FILESDIR}"/${PN}-7.1.1-npp13.patch
+       "${FILESDIR}"/ffmpeg-6.1-opencl-parallel-gmake-fix.patch
+       "${FILESDIR}"/ffmpeg-7.1.1-svt-av1-3.patch
+       "${FILESDIR}"/ffmpeg-7.1.1-npp13.patch
 )
 
 pkg_pretend() {

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild 
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index c8612f1900a5..a7ec799f8b41 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -334,7 +334,7 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch
+       "${FILESDIR}"/ffmpeg-6.1-opencl-parallel-gmake-fix.patch
 )
 
 pkg_pretend() {