commit: df517a7d5553e3d853dd9bf3bfdca3eb0beda5a5 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Tue Nov 6 21:34:49 2018 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Tue Nov 6 21:37:05 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df517a7d
media-plugins/gst-plugins-libav: reduce damage from uncoordinated ffmpeg-4 unmask by requiring <ffmpeg-4 Bug: https://bugs.gentoo.org/654628 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.1.ebuild | 6 ++++-- media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.2.ebuild | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.1.ebuild index 2f7753d327a..36627fa21b7 100644 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.1.ebuild +++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,7 +19,9 @@ RDEPEND=" >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] >=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}] >=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}] - !libav? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] ) + !libav? ( + >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] + <media-video/ffmpeg-4 ) libav? ( app-arch/bzip2[${MULTILIB_USEDEP}] app-arch/xz-utils[${MULTILIB_USEDEP}] diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.2.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.2.ebuild index c94b53d700b..085a01f6831 100644 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.2.ebuild +++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.14.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,7 +19,9 @@ RDEPEND=" >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] >=media-libs/gstreamer-${PV}:1.0[${MULTILIB_USEDEP}] >=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}] - !libav? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] ) + !libav? ( + >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] + <media-video/ffmpeg-4 ) libav? ( app-arch/bzip2[${MULTILIB_USEDEP}] app-arch/xz-utils[${MULTILIB_USEDEP}]
