diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-02-08 19:43:51 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-02-08 19:43:51 +0000 |
| commit | 6251ddbe18ed8992b02b66968599ba6753c12080 (patch) | |
| tree | 8fe32543674a2ed534cf707bb2ec74e11e70e1a6 /media-video | |
| parent | Stable for HPPA (bug #397199). (diff) | |
| download | gentoo-2-6251ddbe18ed8992b02b66968599ba6753c12080.tar.gz gentoo-2-6251ddbe18ed8992b02b66968599ba6753c12080.tar.bz2 gentoo-2-6251ddbe18ed8992b02b66968599ba6753c12080.zip | |
Add missing GPL requirement over x264. Ack by Luca.
(Portage version: 2.2.0_alpha85/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.7.9999.ebuild | 6 | ||||
| -rw-r--r-- | media-video/libav/libav-0.8.9999.ebuild | 5 | ||||
| -rw-r--r-- | media-video/libav/libav-0.8.ebuild | 5 | ||||
| -rw-r--r-- | media-video/libav/libav-9999.ebuild | 5 |
5 files changed, 17 insertions, 10 deletions
diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog index 55757885970a..d33176e6f130 100644 --- a/media-video/libav/ChangeLog +++ b/media-video/libav/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/libav # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.52 2012/02/07 18:43:58 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.53 2012/02/08 19:43:51 flameeyes Exp $ + + 08 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> libav-0.7.9999.ebuild, + libav-0.8.9999.ebuild, libav-0.8.ebuild, libav-9999.ebuild: + Add missing GPL requirement over x264. Ack by Luca. 07 Feb 2012; Agostino Sarubbo <ago@gentoo.org> libav-0.6.5.ebuild: Stable for AMD64, wrt bug #401017 diff --git a/media-video/libav/libav-0.7.9999.ebuild b/media-video/libav/libav-0.7.9999.ebuild index 44145430f331..f08ed41c6eb6 100644 --- a/media-video/libav/libav-0.7.9999.ebuild +++ b/media-video/libav/libav-0.7.9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild,v 1.4 2011/12/02 18:19:50 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild,v 1.5 2012/02/08 19:43:51 flameeyes Exp $ EAPI=4 @@ -84,7 +84,7 @@ DEPEND="${RDEPEND} # amr and aac require gpl REQUIRED_USE="bindist? ( !faac ) faac? ( !aac ) aac? ( !faac ) - amr? ( gpl ) aac? ( gpl )" + amr? ( gpl ) aac? ( gpl ) x264? ( gpl )" src_prepare() { # if we have snapshot then we need to hardcode the version diff --git a/media-video/libav/libav-0.8.9999.ebuild b/media-video/libav/libav-0.8.9999.ebuild index b231038b9f16..de14c0de0495 100644 --- a/media-video/libav/libav-0.8.9999.ebuild +++ b/media-video/libav/libav-0.8.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/libav/libav-0.8.9999.ebuild,v 1.1 2012/01/27 10:50:21 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.2 2012/02/08 19:43:51 flameeyes Exp $ EAPI=4 @@ -96,8 +96,9 @@ DEPEND="${RDEPEND} # openssl support marked as nonfree # faac and aac are concurent implementations # amr and aac require at least lgpl3 +# x264 requires gpl2 REQUIRED_USE="bindist? ( !faac !openssl ) - amr? ( gpl ) aac? ( gpl )" + amr? ( gpl ) aac? ( gpl ) x264? ( gpl )" RESTRICT="test" diff --git a/media-video/libav/libav-0.8.ebuild b/media-video/libav/libav-0.8.ebuild index 3ed8c1a1c5d2..c41e94fc05c0 100644 --- a/media-video/libav/libav-0.8.ebuild +++ b/media-video/libav/libav-0.8.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/libav/libav-0.8.ebuild,v 1.3 2012/01/27 10:11:41 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.ebuild,v 1.4 2012/02/08 19:43:51 flameeyes Exp $ EAPI=4 @@ -96,8 +96,9 @@ DEPEND="${RDEPEND} # openssl support marked as nonfree # faac and aac are concurent implementations # amr and aac require at least lgpl3 +# x264 requires gpl2 REQUIRED_USE="bindist? ( !faac !openssl ) - amr? ( gpl ) aac? ( gpl )" + amr? ( gpl ) aac? ( gpl ) x264? ( gpl )" RESTRICT="test" diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild index b21038d05b71..7be12898badf 100644 --- a/media-video/libav/libav-9999.ebuild +++ b/media-video/libav/libav-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/libav/libav-9999.ebuild,v 1.27 2012/01/27 10:11:41 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.28 2012/02/08 19:43:51 flameeyes Exp $ EAPI=4 @@ -96,8 +96,9 @@ DEPEND="${RDEPEND} # openssl support marked as nonfree # faac and aac are concurent implementations # amr and aac require at least lgpl3 +# x264 requires gpl2 REQUIRED_USE="bindist? ( !faac !openssl ) - amr? ( gpl ) aac? ( gpl )" + amr? ( gpl ) aac? ( gpl ) x264? ( gpl )" RESTRICT="test" |