diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2011-08-18 09:40:05 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2011-08-18 09:40:05 +0000 |
| commit | b859a092d37383f3d74a1357c90ee6fa2a19d029 (patch) | |
| tree | 1c1803228dee0e58d3f1c7c637fdcad2e562713c /media-video | |
| parent | ppc/ppc64 stable wrt #69065 (diff) | |
| download | gentoo-2-b859a092d37383f3d74a1357c90ee6fa2a19d029.tar.gz gentoo-2-b859a092d37383f3d74a1357c90ee6fa2a19d029.tar.bz2 gentoo-2-b859a092d37383f3d74a1357c90ee6fa2a19d029.zip | |
disable tests and let faac and voaacenc built together
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/libav/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/libav/libav-0.8_pre20110818.ebuild | 7 | ||||
| -rw-r--r-- | media-video/libav/libav-9999.ebuild | 9 |
3 files changed, 14 insertions, 8 deletions
diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog index b3a9eb5a0b3a..a19464e376a9 100644 --- a/media-video/libav/ChangeLog +++ b/media-video/libav/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/libav # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.25 2011/08/18 08:50:41 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.26 2011/08/18 09:40:05 lu_zero Exp $ + + 18 Aug 2011; Luca Barbato <lu_zero@gentoo.org> libav-0.8_pre20110818.ebuild, + libav-9999.ebuild: + disable tests and let faac and voaacenc built together 18 Aug 2011; Luca Barbato <lu_zero@gentoo.org> libav-0.8_pre20110818.ebuild: Switch to local permanent url diff --git a/media-video/libav/libav-0.8_pre20110818.ebuild b/media-video/libav/libav-0.8_pre20110818.ebuild index 88435de2d58c..ad4d0bedbc89 100644 --- a/media-video/libav/libav-0.8_pre20110818.ebuild +++ b/media-video/libav/libav-0.8_pre20110818.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8_pre20110818.ebuild,v 1.2 2011/08/18 08:50:41 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8_pre20110818.ebuild,v 1.3 2011/08/18 09:40:05 lu_zero Exp $ EAPI=4 @@ -80,11 +80,12 @@ DEPEND="${RDEPEND} # faac can't be binary distributed # faac and aac are concurent implementations -# amr and aac require gpl +# amr and aac require at least lgpl3 REQUIRED_USE="bindist? ( !faac ) - faac? ( !aac ) aac? ( !faac ) amr? ( gpl ) aac? ( gpl )" +RESTRICT="test" + src_prepare() { # if we have snapshot then we need to hardcode the version if [[ ${PV%_p*} != ${PV} ]]; then diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild index 8cd7dd4ceaa3..9ae3fe9f6529 100644 --- a/media-video/libav/libav-9999.ebuild +++ b/media-video/libav/libav-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.15 2011/08/18 08:21:46 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.16 2011/08/18 09:40:05 lu_zero Exp $ EAPI=4 @@ -17,7 +17,7 @@ HOMEPAGE="http://libav.org/" if [[ ${PV} == *9999 ]] ; then SRC_URI="" elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot - SRC_URI="mirror://gentoo/${P}.tar.xz" + SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz" else # Official release SRC_URI="http://${PN}.org/releases/${P}.tar.xz" fi @@ -80,11 +80,12 @@ DEPEND="${RDEPEND} # faac can't be binary distributed # faac and aac are concurent implementations -# amr and aac require gpl +# amr and aac require at least lgpl3 REQUIRED_USE="bindist? ( !faac ) - faac? ( !aac ) aac? ( !faac ) amr? ( gpl ) aac? ( gpl )" +RESTRICT="test" + src_prepare() { # if we have snapshot then we need to hardcode the version if [[ ${PV%_p*} != ${PV} ]]; then |