diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-04-13 12:40:50 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-04-13 12:40:50 +0000 |
| commit | e60e7433875703585f4205a8f2b7cbbdb255b2eb (patch) | |
| tree | 3c143ab98df0d7212dc5bc584c7cd3840381159a /media-video | |
| parent | Fixed broken translations, icons and help files. Fixed doc-installation (bug ... (diff) | |
| download | historical-e60e7433875703585f4205a8f2b7cbbdb255b2eb.tar.gz historical-e60e7433875703585f4205a8f2b7cbbdb255b2eb.tar.bz2 historical-e60e7433875703585f4205a8f2b7cbbdb255b2eb.zip | |
Enable (L)GPL-3 only when needed
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/Manifest | 10 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 14 |
3 files changed, 17 insertions, 12 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index acf2da1764a3..3dde255c5195 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.406 2011/04/12 14:45:47 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.407 2011/04/13 12:40:50 aballier Exp $ + + 13 Apr 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: + Enable (L)GPL-3 only when needed *ffmpeg-0.6.90_rc0-r1 (12 Apr 2011) diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index c36e678b0782..d5bf8c731b75 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -9,13 +9,13 @@ EBUILD ffmpeg-0.6.90_rc0-r1.ebuild 7904 RMD160 60fc378e6efc81823b67b0bd995d91f08 EBUILD ffmpeg-0.6.90_rc0.ebuild 7864 RMD160 f266bdd1ab9aaace521174912e8c71215d66629c SHA1 c063d73e5fb0dd5b80c1270857418553f672e73a SHA256 1788b9714e627610ba2dff1f94fae19060633f57251bb4bd5a59e0f8d2f8e7b9 EBUILD ffmpeg-0.6.ebuild 7782 RMD160 7dcb53dfd7bed74aa95a6813cad6c55f9fc7f062 SHA1 92d32ee520b6125b1e825bb98f3731cdfb9918c8 SHA256 ba710a4af02900b36fc1ef8d4a60bfb9a216040b3974a2394c1e8e7cec5ef52c EBUILD ffmpeg-0.6_p25767.ebuild 7911 RMD160 d573b7275c7d72baf655b3ceadf136d43d2fd5ee SHA1 5e6a9b938d283187120148095ff8621d4bd82ad7 SHA256 387073c421106fa9a2f14e71cdba1524d87eebe5b1fb4ef505908dafb0cd0bf8 -EBUILD ffmpeg-9999.ebuild 8032 RMD160 eab4db0a577f7d9bac284b6ae92ed11b50230eb0 SHA1 42424bc8da087c5723962d1229459adc98e6191c SHA256 47960f4f8e0f7c2da4cf28163a1d4def9b9b492b83bcab039331bc8920f67a12 -MISC ChangeLog 60144 RMD160 fca23e1f0a3d9697f0310031451ff5c9f01ace7a SHA1 f84fac624ec6a46e1c7bde79b003b1f7955ead9a SHA256 53e812f54392683f5d35923a4b6200c3819d6359df9f8c2e04b46dd694289b85 +EBUILD ffmpeg-9999.ebuild 8253 RMD160 2efc2dee48f43b32fdebc5a78afcf1610b832124 SHA1 a8cf525ddb58e82f9e8049ca835bdf3cdf5cdfd6 SHA256 1f500e5a913cde7c541c645de695b01d6b4995908aa1e6387b822a050c766815 +MISC ChangeLog 60252 RMD160 e7ee8f54cd9cdcb52440194d480e40329fe981ad SHA1 5532ec8044c93ee0e11a1db59541547a8dcc4aaf SHA256 7aafc4d234e5e19690c2ccdecf96cd47c0caf26edb007404f1ca58556da0f97e MISC metadata.xml 2402 RMD160 d1226017b36de2614eb29f742fef59b9cb9b3901 SHA1 2f00b54a5f1348fe84d455f04d81988282d91ecc SHA256 8494cfb404ca14fb828175b3fde3fff5b77a925473ee1c3b2028a7060d16907a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk2kZaEACgkQvFcC4BYPU0pVqQCeLSBH1qJEtcK0Ds5klQ7t9SV5 -KEQAn3lxcj5ejWvAlqQ9eYZ2yDMaoK6b -=65+P +iEYEARECAAYFAk2lmdgACgkQvFcC4BYPU0ofGwCglUCcMKn4/5xhjFvxEv/MjM2q +TBgAoKsknccXbrNBpbCxJv3Whlns7coD +=zUsb -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 10568bb643aa..5417f2aad661 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-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/ffmpeg/ffmpeg-9999.ebuild,v 1.40 2011/04/12 13:44:37 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.41 2011/04/13 12:40:50 aballier Exp $ EAPI="2" @@ -23,7 +23,7 @@ else # Release fi FFMPEG_REVISION="${PV#*_p}" -LICENSE="GPL-3" +LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )" SLOT="0" if [ "${PV#9999}" = "${PV}" ] ; then KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" @@ -97,6 +97,8 @@ src_prepare() { src_configure() { local myconf="${EXTRA_FFMPEG_CONF}" + # Set to --enable-version3 if (L)GPL-3 is required + local version3="" # enabled by default for i in debug doc network vaapi zlib; do @@ -118,8 +120,8 @@ src_configure() { if use encode then use mp3 && myconf="${myconf} --enable-libmp3lame" - use aac && myconf="${myconf} --enable-libvo-aacenc" - use amr && myconf="${myconf} --enable-libvo-amrwbenc" + use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; } + use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; } for i in theora vorbis x264 xvid; do use ${i} && myconf="${myconf} --enable-lib${i}" done @@ -153,7 +155,7 @@ src_configure() { use threads && myconf="${myconf} --enable-pthreads" # Decoders - use amr && myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" + use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; } for i in gsm dirac rtmp schroedinger speex vpx; do use ${i} && myconf="${myconf} --enable-lib${i}" done @@ -190,7 +192,7 @@ src_configure() { # Mandatory configuration myconf=" --enable-gpl - --enable-version3 + ${version3} --enable-postproc --enable-avfilter --disable-stripping |