diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2014-03-19 13:57:10 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2014-03-19 13:57:10 +0000 |
| commit | 1c8f6148ac027b5741bb62eb6ec45a292cba9a10 (patch) | |
| tree | 80d8919b7aee0203bdaccd3fe0a2b9814161d6d2 | |
| parent | Stable for alpha, wrt bug #498050 (diff) | |
| download | gentoo-2-1c8f6148ac027b5741bb62eb6ec45a292cba9a10.tar.gz gentoo-2-1c8f6148ac027b5741bb62eb6ec45a292cba9a10.tar.bz2 gentoo-2-1c8f6148ac027b5741bb62eb6ec45a292cba9a10.zip | |
Temporarly block non-live FFMPEG versions in live VLC with USE flag vdpau; fixes bug #503168, reported by jospezial.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
| -rw-r--r-- | media-video/vlc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 267ab5fcdd00..b33b6c08da36 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/vlc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.895 2014/03/19 07:57:21 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.896 2014/03/19 13:57:10 tomwij Exp $ + + 19 Mar 2014; Tom Wijsman <TomWij@gentoo.org> vlc-9999.ebuild: + Temporarly block non-live FFMPEG versions in live VLC with USE flag vdpau; + fixes bug #503168, reported by jospezial. 19 Mar 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.9.ebuild: Adjust upper bound of dvbpsi dependency on vlc 2.0.9; fixes bug #504738, diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 74228589172c..fd4cc386975b 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.214 2014/03/12 16:15:16 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.215 2014/03/19 13:57:10 tomwij Exp $ EAPI="5" @@ -142,8 +142,12 @@ RDEPEND=" upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] ) - vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) - vdpau? ( >=x11-libs/libvdpau-0.6:0 !<media-video/libav-10_beta1 ) + vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )" + +# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works; +# thus we'll have to wait for a new release there. +RDEPEND="${RDEPEND} + vdpau? ( >=x11-libs/libvdpau-0.6:0 !<media-video/libav-10_beta1 !<media-video/ffmpeg-9999 ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) vorbis? ( media-libs/libvorbis:0 ) vpx? ( media-libs/libvpx:0 ) |