Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/
Date: Wed, 05 Feb 2020 20:12:07
Message-Id: 1580933510.1b013bba2f4b42c16d8a3bd2d46a259a79d5bd9d.asturm@gentoo
1 commit: 1b013bba2f4b42c16d8a3bd2d46a259a79d5bd9d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 5 20:09:39 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 5 20:11:50 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b013bba
7
8 media-video/vlc: Restrict USE opencv to <media-libs/opencv-4
9
10 Broken since OpenCV 4.x+ requires C++11 enabled whereas in VLC it is
11 used within C code.
12
13 Closes: https://bugs.gentoo.org/701424
14 Package-Manager: Portage-2.3.87, Repoman-2.3.20
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 media-video/vlc/vlc-3.0.8.ebuild | 4 ++--
18 media-video/vlc/vlc-3.0.9999.ebuild | 4 ++--
19 media-video/vlc/vlc-9999.ebuild | 4 ++--
20 3 files changed, 6 insertions(+), 6 deletions(-)
21
22 diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild
23 index 91eb7fe2f52..1365a0718a5 100644
24 --- a/media-video/vlc/vlc-3.0.8.ebuild
25 +++ b/media-video/vlc/vlc-3.0.8.ebuild
26 @@ -1,4 +1,4 @@
27 -# Copyright 2000-2019 Gentoo Authors
28 +# Copyright 2000-2020 Gentoo Authors
29 # Distributed under the terms of the GNU General Public License v2
30
31 EAPI=7
32 @@ -150,7 +150,7 @@ RDEPEND="
33 ncurses? ( sys-libs/ncurses:0=[unicode] )
34 nfs? ( >=net-fs/libnfs-0.10.0:= )
35 ogg? ( media-libs/libogg )
36 - opencv? ( media-libs/opencv:= )
37 + opencv? ( <media-libs/opencv-4:= )
38 opus? ( >=media-libs/opus-1.0.3 )
39 png? ( media-libs/libpng:0= )
40 postproc? ( libav? ( media-libs/libpostproc ) )
41
42 diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
43 index 8fad4462519..9e019812fe1 100644
44 --- a/media-video/vlc/vlc-3.0.9999.ebuild
45 +++ b/media-video/vlc/vlc-3.0.9999.ebuild
46 @@ -1,4 +1,4 @@
47 -# Copyright 2000-2019 Gentoo Authors
48 +# Copyright 2000-2020 Gentoo Authors
49 # Distributed under the terms of the GNU General Public License v2
50
51 EAPI=7
52 @@ -150,7 +150,7 @@ RDEPEND="
53 ncurses? ( sys-libs/ncurses:0=[unicode] )
54 nfs? ( >=net-fs/libnfs-0.10.0:= )
55 ogg? ( media-libs/libogg )
56 - opencv? ( media-libs/opencv:= )
57 + opencv? ( <media-libs/opencv-4:= )
58 opus? ( >=media-libs/opus-1.0.3 )
59 png? ( media-libs/libpng:0= )
60 postproc? ( libav? ( media-libs/libpostproc ) )
61
62 diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
63 index 6f1c27b496d..116dc942964 100644
64 --- a/media-video/vlc/vlc-9999.ebuild
65 +++ b/media-video/vlc/vlc-9999.ebuild
66 @@ -1,4 +1,4 @@
67 -# Copyright 2000-2019 Gentoo Authors
68 +# Copyright 2000-2020 Gentoo Authors
69 # Distributed under the terms of the GNU General Public License v2
70
71 EAPI=7
72 @@ -152,7 +152,7 @@ RDEPEND="
73 ncurses? ( sys-libs/ncurses:0=[unicode] )
74 nfs? ( >=net-fs/libnfs-0.10.0:= )
75 ogg? ( media-libs/libogg )
76 - opencv? ( media-libs/opencv:= )
77 + opencv? ( <media-libs/opencv-4:= )
78 opus? ( >=media-libs/opus-1.0.3 )
79 png? ( media-libs/libpng:0= )
80 postproc? ( libav? ( media-libs/libpostproc ) )