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

[Ionen Wolkens]

commit:     0ad04a2de46a2c84acbe95d9fb718857fc0b2747
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  1 02:15:17 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Apr  1 02:27:06 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad04a2d

media-video/ffmpeg: slightly clarify S comment

This is to allow copying the ebuild as-is to ffmpeg-compat and
not have to maintain them as two different ebuilds. If same
version, the only difference can at most be keywords if in middle
of stabilization but otherwise these should match as well.

ffmpeg-compat ebuilds could potentially be simplified when the
equivalent ffmpeg version is dropped though.

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

 media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild | 2 +-
 media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild | 2 +-
 media-video/ffmpeg/ffmpeg-7.1.1.ebuild    | 2 +-
 media-video/ffmpeg/ffmpeg-9999.ebuild     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild 
b/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild
index c9e7ad2b7b75..a61c33e1d509 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild
@@ -20,7 +20,7 @@ else
                verify-sig? ( 
https://ffmpeg.org/releases/ffmpeg-${PV}.tar.xz.asc )
                https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 
1-2)-patchset-1.tar.xz
        "
-       S=${WORKDIR}/ffmpeg-${PV} # avoid ${P}
+       S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
        KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 

diff --git a/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild 
b/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild
index 07142e5cc8e4..4a3a3a7e15b3 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild
@@ -27,7 +27,7 @@ else
                "}
                https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 
1-2)-patchset-1.tar.xz
        "
-       S=${WORKDIR}/ffmpeg-${PV} # avoid ${P}
+       S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
        KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 

diff --git a/media-video/ffmpeg/ffmpeg-7.1.1.ebuild 
b/media-video/ffmpeg/ffmpeg-7.1.1.ebuild
index ba96968621fd..48ce87160460 100644
--- a/media-video/ffmpeg/ffmpeg-7.1.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.1.1.ebuild
@@ -26,7 +26,7 @@ else
                        )
                "}
        "
-       S=${WORKDIR}/ffmpeg-${PV} # avoid ${P}
+       S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
        KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild 
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index a8bd33d824f1..7ddbfafb70fc 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -26,7 +26,7 @@ else
                        )
                "}
        "
-       S=${WORKDIR}/ffmpeg-${PV} # avoid ${P}
+       S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
        KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi