From 7c22851f82f0f70389ba2b3298beb46c28c7ac36 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 22 May 2012 14:04:03 +0000 Subject: Change order of USE="postproc" to || ( media-video/ffmpeg media-libs/libpostproc ) (Portage version: 2.2.0_alpha107/cvs/Linux x86_64) --- media-video/vlc/ChangeLog | 7 ++++++- media-video/vlc/vlc-2.0.1.ebuild | 4 ++-- media-video/vlc/vlc-2.0.9999.ebuild | 4 ++-- media-video/vlc/vlc-9999.ebuild | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) (limited to 'media-video') diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 238a265b0f90..5227766906be 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.799 2012/05/21 05:21:20 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.800 2012/05/22 14:04:03 ssuominen Exp $ + + 22 May 2012; Samuli Suominen vlc-2.0.1.ebuild, + vlc-2.0.9999.ebuild, vlc-9999.ebuild: + Change order of USE="postproc" to || ( media-video/ffmpeg + media-libs/libpostproc ) 21 May 2012; Samuli Suominen vlc-1.1.13.ebuild: Remove USE="nsplugin" in favour of media-plugins/npapi-vlc (and because diff --git a/media-video/vlc/vlc-2.0.1.ebuild b/media-video/vlc/vlc-2.0.1.ebuild index 6e2b3931e03a..8609c3851086 100644 --- a/media-video/vlc/vlc-2.0.1.ebuild +++ b/media-video/vlc/vlc-2.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.1.ebuild,v 1.9 2012/05/18 02:22:49 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.1.ebuild,v 1.10 2012/05/22 14:04:03 ssuominen Exp $ EAPI="4" @@ -112,7 +112,7 @@ RDEPEND=" opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) - postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) ) + postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) diff --git a/media-video/vlc/vlc-2.0.9999.ebuild b/media-video/vlc/vlc-2.0.9999.ebuild index d85d967f62dc..deb46f79d048 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-2012 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.10 2012/05/17 14:00:04 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.11 2012/05/22 14:04:03 ssuominen Exp $ EAPI="4" @@ -112,7 +112,7 @@ RDEPEND=" opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) - postproc? ( media-libs/libpostproc ) + postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 5474923a4f48..d6b0f905b675 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.171 2012/05/18 02:22:49 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.172 2012/05/22 14:04:03 ssuominen Exp $ EAPI="4" @@ -111,7 +111,7 @@ RDEPEND=" ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) - postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) ) + postproc? ( || ( media-video/ffmpeg media-libs/libpostproc ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) -- cgit v1.2.3-65-gdbad