media-video/vlc: Restrict USE opencv to <media-libs/opencv-4

Broken since OpenCV 4.x+ requires C++11 enabled whereas in VLC it is
used within C code.

Closes: https://bugs.gentoo.org/701424
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild
index 91eb7fe2f5278aac7411cc59d1e6cee8a588a8fe..1365a0718a5e82c6736a7b27404124dfc1f7d753 100644 (file)
--- a/media-video/vlc/vlc-3.0.8.ebuild
+++ b/media-video/vlc/vlc-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2019 Gentoo Authors
+# Copyright 2000-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -150,7 +150,7 @@ RDEPEND="
        ncurses? ( sys-libs/ncurses:0=[unicode] )
        nfs? ( >=net-fs/libnfs-0.10.0:= )
        ogg? ( media-libs/libogg )
-       opencv? ( media-libs/opencv:= )
+       opencv? ( <media-libs/opencv-4:= )
        opus? ( >=media-libs/opus-1.0.3 )
        png? ( media-libs/libpng:0= )
        postproc? ( libav? ( media-libs/libpostproc ) )

diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 8fad44625193c2902e83825b07fb7dd86626d085..9e019812fe144f1cd23f92d619c84f50fff956a0 100644 (file)
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2019 Gentoo Authors
+# Copyright 2000-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -150,7 +150,7 @@ RDEPEND="
        ncurses? ( sys-libs/ncurses:0=[unicode] )
        nfs? ( >=net-fs/libnfs-0.10.0:= )
        ogg? ( media-libs/libogg )
-       opencv? ( media-libs/opencv:= )
+       opencv? ( <media-libs/opencv-4:= )
        opus? ( >=media-libs/opus-1.0.3 )
        png? ( media-libs/libpng:0= )
        postproc? ( libav? ( media-libs/libpostproc ) )

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 6f1c27b496de1e5f4944bc0a4032d79dc333d8c6..116dc942964cae82d098ce114673a951e23b611a 100644 (file)
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2000-2019 Gentoo Authors
+# Copyright 2000-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -152,7 +152,7 @@ RDEPEND="
        ncurses? ( sys-libs/ncurses:0=[unicode] )
        nfs? ( >=net-fs/libnfs-0.10.0:= )
        ogg? ( media-libs/libogg )
-       opencv? ( media-libs/opencv:= )
+       opencv? ( <media-libs/opencv-4:= )
        opus? ( >=media-libs/opus-1.0.3 )
        png? ( media-libs/libpng:0= )
        postproc? ( libav? ( media-libs/libpostproc ) )