diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2015-03-02 17:01:33 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-03-02 17:01:33 +0000 |
| commit | 83b821191609e840a654d269a2b198c1b8199f7e (patch) | |
| tree | 9b6c54e9a0240066700ade314ef48eb7f6aa8ce2 /media-video/vlc | |
| parent | Add ~ppc, wrt bug #541900 (diff) | |
| download | gentoo-2-83b821191609e840a654d269a2b198c1b8199f7e.tar.gz gentoo-2-83b821191609e840a654d269a2b198c1b8199f7e.tar.bz2 gentoo-2-83b821191609e840a654d269a2b198c1b8199f7e.zip | |
Fix bug #541924 and provide saner defaults
(Portage version: 2.2.17/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-video/vlc')
| -rw-r--r-- | media-video/vlc/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/vlc/vlc-2.2.0.ebuild | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 875f8020c20c..da8e23c4a1da 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/vlc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.938 2015/03/01 09:31:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.939 2015/03/02 17:01:33 lu_zero Exp $ + + 02 Mar 2015; Luca Barbato <lu_zero@gentoo.org> vlc-2.2.0.ebuild: + Fix bug #541924 and provide saner defaults 01 Mar 2015; Agostino Sarubbo <ago@gentoo.org> vlc-2.1.5-r1.ebuild: Stable for ppc64, wrt bug #534532 diff --git a/media-video/vlc/vlc-2.2.0.ebuild b/media-video/vlc/vlc-2.2.0.ebuild index 17a349961fc0..20016c160d71 100644 --- a/media-video/vlc/vlc-2.2.0.ebuild +++ b/media-video/vlc/vlc-2.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.2 2015/02/28 23:09:39 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.3 2015/03/02 17:01:33 lu_zero Exp $ EAPI="5" @@ -49,7 +49,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska media-library cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus - png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba + png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi" @@ -66,7 +66,7 @@ RDEPEND=" avahi? ( >=net-dns/avahi-0.6:0[dbus] ) avcodec? ( !libav? ( media-video/ffmpeg:0= ) - libav? ( media-video/libav:0= ) + libav? ( >=media-video/libav-11:0= ) ) avformat? ( !libav? ( media-video/ffmpeg:0= ) |