commit: 669bc67fee14ad45ffae318e098cc01d7421cf17 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Apr 1 02:13:11 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=669bc67f
media-video/ffmpeg: warn about USE mp3->lame renaming Users that have already upgraded will not see this, but still better late than never. Use pkg_pretend given fits better and old ffmpeg is still installed there to check. Closes: https://bugs.gentoo.org/952971 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild | 9 +++++++++ media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild | 9 +++++++++ media-video/ffmpeg/ffmpeg-7.1.1.ebuild | 9 +++++++++ media-video/ffmpeg/ffmpeg-9999.ebuild | 9 +++++++++ 4 files changed, 36 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild index c7bee8fbe8a4..c9e7ad2b7b75 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild @@ -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/ffmpeg-6.1.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild index 8c6fe47c26b1..07142e5cc8e4 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild @@ -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 diff --git a/media-video/ffmpeg/ffmpeg-7.1.1.ebuild b/media-video/ffmpeg/ffmpeg-7.1.1.ebuild index 42cb8bfe77d0..ba96968621fd 100644 --- a/media-video/ffmpeg/ffmpeg-7.1.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-7.1.1.ebuild @@ -351,6 +351,15 @@ PATCHES=( "${FILESDIR}"/${PN}-7.1.1-svt-av1-3.patch ) +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/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 1069affabc06..a8bd33d824f1 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -345,6 +345,15 @@ PATCHES=( "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch ) +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
