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@gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

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 2f7753d327a7eafc75094b20420772912b10755a..36627fa21b75aa0be875caaebc7f9ffbd07a41f9 100644 (file)
--- 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 c94b53d700b00daceb18db6748ce23ac6c012cf1..085a01f683171d19f5576f51f509e5f85c0f8e15 100644 (file)
--- 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}]