commit: b74599d45c359fcf495b3b580fd0d948e1eb4f39 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jun 3 02:06:18 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jun 3 02:06:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74599d4
media-video/bino: depend on <ffmpeg-5 for old >=bino-2 depends on Qt 6 w/o ffmpeg. Bug: https://bugs.gentoo.org/907682 Bug: https://bugs.gentoo.org/834400 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/bino/bino-1.6.7.ebuild | 5 +++-- media-video/bino/bino-1.6.8.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/media-video/bino/bino-1.6.7.ebuild b/media-video/bino/bino-1.6.7.ebuild index 8c5b35e1714a..c265269dc9c7 100644 --- a/media-video/bino/bino-1.6.7.ebuild +++ b/media-video/bino/bino-1.6.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,6 +14,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="debug doc lirc video_cards_nvidia" +# <ffmpeg-5 for bug #907682 and bug #834400. >=bino-2 uses Qt 6 and drops ffmpeg. RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -23,7 +24,7 @@ RDEPEND=" >=media-libs/libass-0.9.9 >=media-libs/openal-1.15.1 virtual/libintl - >=media-video/ffmpeg-0.7:0= + <media-video/ffmpeg-5:= lirc? ( app-misc/lirc ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )" DEPEND="${RDEPEND}" diff --git a/media-video/bino/bino-1.6.8.ebuild b/media-video/bino/bino-1.6.8.ebuild index d7bdc7c2def6..841c5e2b3aa8 100644 --- a/media-video/bino/bino-1.6.8.ebuild +++ b/media-video/bino/bino-1.6.8.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 @@ -14,6 +14,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="debug doc lirc video_cards_nvidia" +# <ffmpeg-5 for bug #907682 and bug #834400. >=bino-2 uses Qt 6 and drops ffmpeg. RDEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -23,7 +24,7 @@ RDEPEND=" >=media-libs/libass-0.9.9 >=media-libs/openal-1.15.1 virtual/libintl - >=media-video/ffmpeg-0.7:0= + <media-video/ffmpeg-5:= lirc? ( app-misc/lirc ) video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )" DEPEND="${RDEPEND}"