diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-07-03 19:36:26 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-07-03 19:36:26 +0000 |
| commit | b23cb5f9bcc45fce1b41c15f3b8f85c7973f0415 (patch) | |
| tree | aef42edef619caf3baff96af80b03058bccf56b4 /media-video/ffmpeg | |
| parent | Apply resize2fs fix from upstream #276352 by Matthias Schwarzott, fix findfs ... (diff) | |
| download | historical-b23cb5f9bcc45fce1b41c15f3b8f85c7973f0415.tar.gz historical-b23cb5f9bcc45fce1b41c15f3b8f85c7973f0415.tar.bz2 historical-b23cb5f9bcc45fce1b41c15f3b8f85c7973f0415.zip | |
force a non free license only when needed, ie, when faac or amr is requested
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/Manifest | 10 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999-r1.ebuild | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 57917a431876..a30c6ec016f9 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.296 2009/07/03 19:31:42 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.297 2009/07/03 19:36:26 aballier Exp $ + + 03 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild: + force a non free license only when needed, ie, when faac or amr is + requested 03 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild, metadata.xml: diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index d9d20bee3124..bf5f48b38646 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -5,13 +5,13 @@ DIST ffmpeg-0.4.9-p20090201.tar.bz2 2697161 RMD160 8cd01f4d6b6adc772d836de592dce DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a EBUILD ffmpeg-0.4.9_p20090201.ebuild 6270 RMD160 9f5df63085a7c7851a3cae03b1a4429eaa60efc1 SHA1 63250edd4d6f7ecacf42b8a1ea176e3704bd85f2 SHA256 cb346a085c719dd5db7df5beebab4fd658777b4c2c7adc00a3cc4503d815bc3a EBUILD ffmpeg-0.5-r1.ebuild 6221 RMD160 185cd17de11fbd1a1dcfd012188bc3cb11a542b5 SHA1 f28aaa9a372e93e5ee989acf66a1d214f58f8f23 SHA256 e91f04a5a5b69699f4f2532f1df67ef6e89ba5b47fb706828a3388727963a726 -EBUILD ffmpeg-9999-r1.ebuild 6302 RMD160 b226ef6b905ea1746c285e6397b501fec396325d SHA1 f77443fdb02e74ebadfb74f2b2d8cbf6f03f06ff SHA256 2dba1963c1288933091b7f74933018086d91f6fc5d017839b5dbf266d84bb1f2 -MISC ChangeLog 44951 RMD160 1cf66ad3b32c3c415e51b0fbb7180ca8b459cf99 SHA1 6051ab9c8afb298d8cedcdbdf343e68112e61ad6 SHA256 abc2279b0176b3c3c8698ffdc99eda2bba1dde5f5d558363351512066a7fc28a +EBUILD ffmpeg-9999-r1.ebuild 6331 RMD160 aa155a9a8804e0220ee2819da0f5599531a5114a SHA1 bff26b3f9add067ffb0568942ff9f1050a8e9267 SHA256 a0eb5e7f4692a0bb966df04164295b3b31d05d185299a9234ef5eac92289428f +MISC ChangeLog 45108 RMD160 ba9e2cbc1c39f0e589b7a43d760cab65e6c70811 SHA1 54e7d3632c2a989d025cf988f2930640ce4e0664 SHA256 61d541cbfcba539aeb4d64514d2728ea9720885a80c1ea539debd2f2261febad MISC metadata.xml 1798 RMD160 bf7be02af72b3455d18eda5253da7e8a4cb5b4fd SHA1 efe70dc4c31f732c793f3b1b6820d27bea0ebd1e SHA256 8253fdc43d056bdc3787a1d6884db1b1268b8c4565c69864da80245860f904fa -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (GNU/Linux) -iEYEARECAAYFAkpOXL8ACgkQvFcC4BYPU0ptDACgxqjg3W2ghQgWgBhtDqeGD9jK -J70AoLD+12jUPXndJr0OJTmTWMCy/tx6 -=IqXK +iEYEARECAAYFAkpOXdwACgkQvFcC4BYPU0pj+wCgkOIjnj2/p04tQ0JAmkKkQkIg +zikAnjoeafto+qGS4j35JKCJUWCwBsM8 +=EmSb -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild index 55295d0de926..27946b0a1a69 100644 --- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.5 2009/07/03 19:31:42 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.6 2009/07/03 19:36:26 aballier Exp $ EAPI=2 @@ -116,7 +116,7 @@ src_configure() { use amr && myconf="${myconf} --enable-libamr-nb \ --enable-libamr-wb" use faac && myconf="${myconf} --enable-libfaac" - myconf="${myconf} --enable-nonfree" + { use faac || use amr ; } && myconf="${myconf} --enable-nonfree" fi # CPU features |