tomwij 14/03/19 13:57:10 Modified: vlc-9999.ebuild ChangeLog Log: 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)
Revision Changes Path 1.215 media-video/vlc/vlc-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.215&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.215&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.214&r2=1.215 Index: vlc-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- vlc-9999.ebuild 12 Mar 2014 16:15:16 -0000 1.214 +++ vlc-9999.ebuild 19 Mar 2014 13:57:10 -0000 1.215 @@ -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 @@ 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 ) 1.896 media-video/vlc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.896&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.896&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.895&r2=1.896 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v retrieving revision 1.895 retrieving revision 1.896 diff -u -r1.895 -r1.896 --- ChangeLog 19 Mar 2014 07:57:21 -0000 1.895 +++ ChangeLog 19 Mar 2014 13:57:10 -0000 1.896 @@ -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 <[email protected]> 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 <[email protected]> vlc-2.0.9.ebuild: Adjust upper bound of dvbpsi dependency on vlc 2.0.9; fixes bug #504738,
