[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/

[Mike Gilbert]

commit:     3de3e369fb2d6017d1dc063b4b19f823423167c8
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Jun 12 18:55:18 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 19:50:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de3e369

media-video/vlc: Fix dependencies of "speex" USE flag (bug #612792).

 media-video/vlc/{vlc-2.2.9999.ebuild => vlc-2.2.6-r1.ebuild} | 6 +++++-
 media-video/vlc/vlc-2.2.9999.ebuild                          | 2 +-
 media-video/vlc/vlc-9999.ebuild                              | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/media-video/vlc/vlc-2.2.9999.ebuild 
b/media-video/vlc/vlc-2.2.6-r1.ebuild
similarity index 98%
copy from media-video/vlc/vlc-2.2.9999.ebuild
copy to media-video/vlc/vlc-2.2.6-r1.ebuild
index b8c66d76518..dac65a9b17d 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.6-r1.ebuild
@@ -131,7 +131,7 @@ RDEPEND="
        shout? ( >=media-libs/libshout-2.1:0 )
        sid? ( media-libs/libsidplay:2 )
        skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-       speex? ( media-libs/speex:0 )
+       speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 )
        svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
        swscale? (
                !libav? ( media-video/ffmpeg:0= )
@@ -223,6 +223,10 @@ PATCHES=(
        # Allow QT5.5 since Gentoo has a patched QTwidgets
        "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
 
+       # Bug #575072
+       "${FILESDIR}"/${PN}-2.2.4-relax_ffmpeg.patch
+       "${FILESDIR}"/${PN}-2.2.4-ffmpeg3.patch
+
        # Bug #589396
        "${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
 

diff --git a/media-video/vlc/vlc-2.2.9999.ebuild 
b/media-video/vlc/vlc-2.2.9999.ebuild
index b8c66d76518..3f968e15afb 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -131,7 +131,7 @@ RDEPEND="
        shout? ( >=media-libs/libshout-2.1:0 )
        sid? ( media-libs/libsidplay:2 )
        skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-       speex? ( media-libs/speex:0 )
+       speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 )
        svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
        swscale? (
                !libav? ( media-video/ffmpeg:0= )

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index b898269d9b3..9ac7239ce21 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -131,7 +131,7 @@ RDEPEND="
        shout? ( >=media-libs/libshout-2.1:0 )
        sid? ( media-libs/libsidplay:2 )
        skins? ( x11-libs/libXext:0 x11-libs/libXpm:0 x11-libs/libXinerama:0 )
-       speex? ( media-libs/speex:0 )
+       speex? ( >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 )
        svg? ( >=gnome-base/librsvg-2.9:2 >=x11-libs/cairo-1.13.1:0 )
        swscale? (
                !libav? ( media-video/ffmpeg:0= )