diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-05-18 02:22:49 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2012-05-18 02:22:49 +0000 |
| commit | a2efdf55bef0e1208b950aae3619071f796db0f8 (patch) | |
| tree | 323a981e2729308d54cc1917fc495e0d680438d4 /media-video/vlc | |
| parent | Bump (diff) | |
| download | gentoo-2-a2efdf55bef0e1208b950aae3619071f796db0f8.tar.gz gentoo-2-a2efdf55bef0e1208b950aae3619071f796db0f8.tar.bz2 gentoo-2-a2efdf55bef0e1208b950aae3619071f796db0f8.zip | |
Revert previous commit.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'media-video/vlc')
| -rw-r--r-- | media-video/vlc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/vlc/vlc-2.0.1.ebuild | 4 | ||||
| -rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 107480074fb5..b606229a1d0e 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,10 @@ # 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.797 2012/05/17 14:00:04 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.798 2012/05/18 02:22:49 chithanh Exp $ + + 18 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + vlc-2.0.1.ebuild, vlc-9999.ebuild: + Revert previous commit. 17 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> vlc-2.0.1.ebuild, vlc-2.0.9999.ebuild, vlc-9999.ebuild: diff --git a/media-video/vlc/vlc-2.0.1.ebuild b/media-video/vlc/vlc-2.0.1.ebuild index c9d889a43313..6e2b3931e03a 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.8 2012/05/17 14:00:04 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.1.ebuild,v 1.9 2012/05/18 02:22:49 chithanh 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-libs/libpostproc media-video/ffmpeg ) ) 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 425c9b149fd5..5474923a4f48 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.170 2012/05/17 14:00:04 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.171 2012/05/18 02:22:49 chithanh 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 ) + postproc? ( || ( media-libs/libpostproc media-video/ffmpeg ) ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) |