commit: 89ba9db04eec4c4e8c9f7e0d225238c1c1377266 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Feb 15 06:48:36 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Feb 15 06:48:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89ba9db0
media-libs/chromaprint: depend on <ffmpeg-5 Bug: https://bugs.gentoo.org/884393 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild index 123873b60767..df7811180d4a 100644 --- a/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild +++ b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,9 +19,11 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" IUSE="test tools" RESTRICT="!test? ( test )" -# Default to fftw to avoid awkward circular dependency w/ ffmpeg +# - Default to fftw to avoid awkward circular dependency w/ ffmpeg # See bug #833821 for an example -RDEPEND="tools? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] ) +# - <ffmpeg-5 dep for 1.5.1 for bug #884393, newer versions likely have +# a hard requirement on >=ffmpeg-5 +RDEPEND="tools? ( <media-video/ffmpeg-5:=[${MULTILIB_USEDEP}] ) !tools? ( sci-libs/fftw:=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
