diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-12-19 11:17:53 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-12-19 11:17:53 +0000 |
| commit | bb27d2fb60164ba445decc8c89c769f51e617a4e (patch) | |
| tree | 01db0addd69908af97e345d536191b696937fcf5 | |
| parent | Added new version that solves the mpeg4ip conflict and applies the fix for Fr... (diff) | |
| download | gentoo-2-bb27d2fb60164ba445decc8c89c769f51e617a4e.tar.gz gentoo-2-bb27d2fb60164ba445decc8c89c769f51e617a4e.tar.bz2 gentoo-2-bb27d2fb60164ba445decc8c89c769f51e617a4e.zip | |
Move block on pre-r8 versions of faad2, that now depends on this.
(Portage version: 2.1_pre1)
| -rw-r--r-- | media-video/mpeg4ip/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog index 34b404fdd6e2..0777fb969bf2 100644 --- a/media-video/mpeg4ip/ChangeLog +++ b/media-video/mpeg4ip/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/mpeg4ip # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.28 2005/11/19 17:12:01 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.29 2005/12/19 11:17:53 flameeyes Exp $ + + 19 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> mpeg4ip-1.4.1.ebuild: + Move block on pre-r8 versions of faad2, that now depends on this. 19 Nov 2005; Olivier Crête <tester@gentoo.org> mpeg4ip-1.4.1.ebuild: Stripped -Werror, fixes bug #97936 diff --git a/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild index cd215603498c..5364a884e753 100644 --- a/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild +++ b/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild,v 1.2 2005/11/19 17:12:01 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.4.1.ebuild,v 1.3 2005/12/19 11:17:53 flameeyes Exp $ inherit eutils multilib @@ -38,7 +38,7 @@ RDEPEND=" media-libs/libsdl alsa? ( media-libs/alsa-lib ) arts? ( kde-base/arts ) esd? ( media-sound/esound ) - !media-libs/faad2 " + !<media-libs/faad2-2.0-r7 " DEPEND="${RDEPEND} sys-devel/libtool |