diff options
| author |   Eli Schwartz <eschwartz@gentoo.org> | 2024-11-03 00:00:24 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@gentoo.org> | 2024-11-03 14:07:10 -0500 |
| commit | 4ee14f4cfa568a762db6224d38d869ec0a1cb230 (patch) | |
| tree | 9f9936a1c5ace187b37301b82f1ed6db455f9519 /media-video | |
| parent | www-apps/jellyfin-bin: drop 10.10.0 (diff) | |
| download | gentoo-4ee14f4cfa568a762db6224d38d869ec0a1cb230.tar.gz gentoo-4ee14f4cfa568a762db6224d38d869ec0a1cb230.tar.bz2 gentoo-4ee14f4cfa568a762db6224d38d869ec0a1cb230.zip | |
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@gentoo.org>
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/noad/noad-0.8.8.ebuild | 5 |
1 files 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" |