diff options
author | Tom Wijsman <tomwij@gentoo.org> | 2013-11-10 15:41:55 +0000 |
---|---|---|
committer | Tom Wijsman <tomwij@gentoo.org> | 2013-11-10 15:41:55 +0000 |
commit | 351d3eea24ab5b2f5e089d30ba600575477b4629 (patch) | |
tree | 871c75e36f7de6b2d45f4a4f1e16a41a8b1491b1 /media-video/vlc | |
parent | Mask llvm flag until sys-devel/llvm is keyworded, bug #320221. (diff) | |
download | gentoo-2-351d3eea24ab5b2f5e089d30ba600575477b4629.tar.gz gentoo-2-351d3eea24ab5b2f5e089d30ba600575477b4629.tar.bz2 gentoo-2-351d3eea24ab5b2f5e089d30ba600575477b4629.zip |
Made USE="vaapi" depend on virtual/ffmpeg[vaapi] as that is needed for GPU accelerated decoding; fixes bug #430960 reported by James and dolohow, with the help of Alexis Ballier (aballier).
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'media-video/vlc')
-rw-r--r-- | media-video/vlc/ChangeLog | 10 | ||||
-rw-r--r-- | media-video/vlc/vlc-2.0.5.ebuild | 4 | ||||
-rw-r--r-- | media-video/vlc/vlc-2.0.6.ebuild | 4 | ||||
-rw-r--r-- | media-video/vlc/vlc-2.0.7.ebuild | 4 | ||||
-rw-r--r-- | media-video/vlc/vlc-2.0.8.ebuild | 4 | ||||
-rw-r--r-- | media-video/vlc/vlc-2.0.8a.ebuild | 4 | ||||
-rw-r--r-- | media-video/vlc/vlc-2.0.9.ebuild | 4 | ||||
-rw-r--r-- | media-video/vlc/vlc-2.0.9999.ebuild | 4 | ||||
-rw-r--r-- | media-video/vlc/vlc-2.1.0.ebuild | 4 | ||||
-rw-r--r-- | media-video/vlc/vlc-2.1.9999.ebuild | 4 | ||||
-rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 4 |
11 files changed, 29 insertions, 21 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index c212fd6c9faf..58b86ad63558 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-video/vlc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.872 2013/11/10 15:25:45 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.873 2013/11/10 15:41:55 tomwij Exp $ + + 10 Nov 2013; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.5.ebuild, + vlc-2.0.6.ebuild, vlc-2.0.7.ebuild, vlc-2.0.8.ebuild, vlc-2.0.8a.ebuild, + vlc-2.0.9.ebuild, vlc-2.0.9999.ebuild, vlc-2.1.0.ebuild, vlc-2.1.9999.ebuild, + vlc-9999.ebuild: + Made USE="vaapi" depend on virtual/ffmpeg[vaapi] as that is needed for GPU + accelerated decoding; fixes bug #430960 reported by James and dolohow, with + the help of Alexis Ballier (aballier). 10 Nov 2013; Tom Wijsman <TomWij@gentoo.org> vlc-2.1.0.ebuild: Fix pre-processor checks for 2.1.0 when avcodec USE flag is disabled; fixes diff --git a/media-video/vlc/vlc-2.0.5.ebuild b/media-video/vlc/vlc-2.0.5.ebuild index 53df697afb68..bde1c111416a 100644 --- a/media-video/vlc/vlc-2.0.5.ebuild +++ b/media-video/vlc/vlc-2.0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.5.ebuild,v 1.9 2013/08/11 22:57:34 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.5.ebuild,v 1.10 2013/11/10 15:41:55 tomwij Exp $ EAPI="5" @@ -138,7 +138,7 @@ RDEPEND=" udev? ( virtual/udev ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) - vaapi? ( x11-libs/libva ) + vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 ) diff --git a/media-video/vlc/vlc-2.0.6.ebuild b/media-video/vlc/vlc-2.0.6.ebuild index 5bb7ff456153..47c2ede46934 100644 --- a/media-video/vlc/vlc-2.0.6.ebuild +++ b/media-video/vlc/vlc-2.0.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.6.ebuild,v 1.7 2013/08/11 22:57:34 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.6.ebuild,v 1.8 2013/11/10 15:41:55 tomwij Exp $ EAPI="5" @@ -138,7 +138,7 @@ RDEPEND=" udev? ( virtual/udev ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) - vaapi? ( x11-libs/libva ) + vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 ) diff --git a/media-video/vlc/vlc-2.0.7.ebuild b/media-video/vlc/vlc-2.0.7.ebuild index 7f96d16eaeed..d49656ddcf38 100644 --- a/media-video/vlc/vlc-2.0.7.ebuild +++ b/media-video/vlc/vlc-2.0.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.7.ebuild,v 1.8 2013/09/05 10:45:56 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.7.ebuild,v 1.9 2013/11/10 15:41:55 tomwij Exp $ EAPI="5" @@ -138,7 +138,7 @@ RDEPEND=" udev? ( virtual/udev ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) - vaapi? ( x11-libs/libva ) + vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) X? ( x11-libs/libX11 ) diff --git a/media-video/vlc/vlc-2.0.8.ebuild b/media-video/vlc/vlc-2.0.8.ebuild index 99be21d11759..e12c0f49dbb3 100644 --- a/media-video/vlc/vlc-2.0.8.ebuild +++ b/media-video/vlc/vlc-2.0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8.ebuild,v 1.2 2013/10/26 17:16:29 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8.ebuild,v 1.3 2013/11/10 15:41:55 tomwij Exp $ EAPI="5" @@ -139,7 +139,7 @@ RDEPEND=" udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) - vaapi? ( x11-libs/libva:0 ) + vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) visual? ( media-libs/libvisual:0.4 ) vorbis? ( media-libs/libvorbis:0 ) diff --git a/media-video/vlc/vlc-2.0.8a.ebuild b/media-video/vlc/vlc-2.0.8a.ebuild index 441afd533b39..90f6a30d395c 100644 --- a/media-video/vlc/vlc-2.0.8a.ebuild +++ b/media-video/vlc/vlc-2.0.8a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8a.ebuild,v 1.2 2013/10/26 17:16:29 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8a.ebuild,v 1.3 2013/11/10 15:41:55 tomwij Exp $ EAPI="5" @@ -139,7 +139,7 @@ RDEPEND=" udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) - vaapi? ( x11-libs/libva:0 ) + vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) visual? ( media-libs/libvisual:0.4 ) vorbis? ( media-libs/libvorbis:0 ) diff --git a/media-video/vlc/vlc-2.0.9.ebuild b/media-video/vlc/vlc-2.0.9.ebuild index 229ddb7fd282..b3c66e8f7627 100644 --- a/media-video/vlc/vlc-2.0.9.ebuild +++ b/media-video/vlc/vlc-2.0.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9.ebuild,v 1.2 2013/10/26 17:16:29 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9.ebuild,v 1.3 2013/11/10 15:41:55 tomwij Exp $ EAPI="5" @@ -139,7 +139,7 @@ RDEPEND=" udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) - vaapi? ( x11-libs/libva:0 ) + vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) visual? ( media-libs/libvisual:0.4 ) vorbis? ( media-libs/libvorbis:0 ) diff --git a/media-video/vlc/vlc-2.0.9999.ebuild b/media-video/vlc/vlc-2.0.9999.ebuild index 4bce31b13a4d..7e2d124879a7 100644 --- a/media-video/vlc/vlc-2.0.9999.ebuild +++ b/media-video/vlc/vlc-2.0.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.32 2013/10/26 17:16:29 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.33 2013/11/10 15:41:55 tomwij Exp $ EAPI="5" @@ -139,7 +139,7 @@ RDEPEND=" udev? ( virtual/udev:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) - vaapi? ( x11-libs/libva:0 ) + vaapi? ( x11-libs/libva:0 virtual/ffmpeg[vaapi] ) vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 ) visual? ( media-libs/libvisual:0.4 ) vorbis? ( media-libs/libvorbis:0 ) diff --git a/media-video/vlc/vlc-2.1.0.ebuild b/media-video/vlc/vlc-2.1.0.ebuild index 1706ab20359f..b449a0242a0d 100644 --- a/media-video/vlc/vlc-2.1.0.ebuild +++ b/media-video/vlc/vlc-2.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.0.ebuild,v 1.6 2013/11/10 15:25:45 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.0.ebuild,v 1.7 2013/11/10 15:41:55 tomwij Exp $ EAPI="5" @@ -141,7 +141,7 @@ RDEPEND=" udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) - vaapi? ( x11-libs/libva: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-9.11 ) vorbis? ( media-libs/libvorbis:0 ) diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild index c832561a1a60..229f08bee96a 100644 --- a/media-video/vlc/vlc-2.1.9999.ebuild +++ b/media-video/vlc/vlc-2.1.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.9 2013/10/27 13:24:41 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.10 2013/11/10 15:41:55 tomwij Exp $ EAPI="5" @@ -141,7 +141,7 @@ RDEPEND=" udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) - vaapi? ( x11-libs/libva: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-9.11 ) vorbis? ( media-libs/libvorbis:0 ) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index bf6aa14a54b3..dabaccf09224 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.203 2013/10/27 13:24:41 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.204 2013/11/10 15:41:55 tomwij Exp $ EAPI="5" @@ -141,7 +141,7 @@ RDEPEND=" udev? ( >=virtual/udev-142:0 ) upnp? ( net-libs/libupnp:0 ) v4l? ( media-libs/libv4l:0 ) - vaapi? ( x11-libs/libva: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-9.11 ) vnc? ( >=net-libs/libvncserver-0.9.9:0 ) |