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

[Ionen Wolkens]

commit:     74d3d93ecdd352b691f15234d31cc4612a6037e7
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  1 02:17:35 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=74d3d93e

media-video/ffmpeg-compat: sync with ffmpeg

Not that the pkg_pretend is meaningful in ffmpeg-compat.

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

 media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild | 11 ++++++++++-
 media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild 
b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild
index c7bee8fbe8a4..a61c33e1d509 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.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
 
@@ -290,6 +290,15 @@ PATCHES=(
        "${WORKDIR}"/patches
 )
 
+pkg_pretend() {
+       # TODO: drop this after a few months
+       if has_version "${CATEGORY}/${PN}[mp3]" && use !lame; then #952971
+               ewarn "${PN}'s 'mp3' USE was renamed to 'lame', please enable 
it"
+               ewarn "if wish to keep the ability to encode using 
media-sound/lame."
+               ewarn "This is *not* needed if only want mp3 playback."
+       fi
+}
+
 pkg_setup() {
        [[ ${MERGE_TYPE} != binary ]] || return
 

diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild 
b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild
index 8c6fe47c26b1..4a3a3a7e15b3 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.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
 
@@ -340,6 +340,15 @@ PATCHES=(
        "${WORKDIR}"/patches
 )
 
+pkg_pretend() {
+       # TODO: drop this after a few months
+       if has_version "${CATEGORY}/${PN}[mp3]" && use !lame; then #952971
+               ewarn "${PN}'s 'mp3' USE was renamed to 'lame', please enable 
it"
+               ewarn "if wish to keep the ability to encode using 
media-sound/lame."
+               ewarn "This is *not* needed if only want mp3 playback."
+       fi
+}
+
 pkg_setup() {
        [[ ${MERGE_TYPE} != binary ]] || return