commit: 4ee14f4cfa568a762db6224d38d869ec0a1cb230 Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> AuthorDate: Sun Nov 3 04:00:24 2024 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Sun Nov 3 19:07:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee14f4c
media-video/noad: restore dependency on <ffmpeg-5 Restores commit 43ad97426db5e10cfffd668499bae7e55fb2ddca, which was backed out by a revbump that did not rebase on the latest version of the ebuild. Fixes: c5202bba6c7a4dab13c4db91d38764ad498d2f28 Closes: https://bugs.gentoo.org/834408 Closes: https://bugs.gentoo.org/916548 Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org> media-video/noad/noad-0.8.8.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/media-video/noad/noad-0.8.8.ebuild b/media-video/noad/noad-0.8.8.ebuild index 408b4c6b7d02..00d2b5cc1c84 100644 --- a/media-video/noad/noad-0.8.8.ebuild +++ b/media-video/noad/noad-0.8.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,9 +15,10 @@ KEYWORDS="amd64 x86" IUSE="+ffmpeg imagemagick libmpeg2" REQUIRED_USE="|| ( ffmpeg libmpeg2 )" +# <ffmpeg-5 dep for bug #834408, https://github.com/madmartin/noad/issues/2 DEPEND=" libmpeg2? ( media-libs/libmpeg2 ) - ffmpeg? ( media-video/ffmpeg:= ) + ffmpeg? ( <media-video/ffmpeg-5:= ) imagemagick? ( media-gfx/imagemagick:= )" RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig"
