diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2010-03-10 11:24:36 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2010-03-10 11:24:36 +0000 |
| commit | 029cedee39eec62b7d69fe3ef9961b84ccc563cd (patch) | |
| tree | e443a9b8cc25a768a13b5888bf94295896839960 /media-video | |
| parent | Fixed INSTALLing missing documentation. Fixes bug #297342. (diff) | |
| download | historical-029cedee39eec62b7d69fe3ef9961b84ccc563cd.tar.gz historical-029cedee39eec62b7d69fe3ef9961b84ccc563cd.tar.bz2 historical-029cedee39eec62b7d69fe3ef9961b84ccc563cd.zip | |
simplify libgsm code as upstream now uses a more standard way for #including it
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-video')
| -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 | 9 |
3 files changed, 12 insertions, 13 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index d8923c582f80..bac17ed40683 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.343 2010/02/04 19:54:28 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.344 2010/03/10 11:24:36 aballier Exp $ + + 10 Mar 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild: + simplify libgsm code as upstream now uses a more standard way for + #including it 04 Feb 2010; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.5_p21602.ebuild, ffmpeg-9999-r1.ebuild: diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 671af71cc35c..84eac087a1c8 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -10,13 +10,13 @@ EBUILD ffmpeg-0.5-r1.ebuild 6579 RMD160 5e83ac138a45d2f52b16ee72c1ee6ff3073d2e21 EBUILD ffmpeg-0.5_p20373.ebuild 7682 RMD160 b208ba9200fbbe8e620d522ad0c5b9da20bc7018 SHA1 ad08eecc6a8d1591dc396313d0ead7e46e19b037 SHA256 354f2fb18bbc8f91faf18c0e61de04dde638afd78542499565e8d03a180ff5d7 EBUILD ffmpeg-0.5_p20601-r1.ebuild 7887 RMD160 b291765ffc2f18d08b7e28f8b33f88d4597dd90e SHA1 96836583d0824ddb24acbbbd7fe46ba5377db9e1 SHA256 5938dd35b44622801fe9bc0b87592e0b24e3605fe74d4eb55fc8e1393f9ccce7 EBUILD ffmpeg-0.5_p21602.ebuild 7687 RMD160 ddcc28954fe809022c1c0e060f57fe7837e5c8f5 SHA1 df845463ef82a0e4b721c091b666f71d5133666e SHA256 6ce66370cad761c2a9b5f29dffa8f24e7d0222c61be18dc3cd16c86ea4dac084 -EBUILD ffmpeg-9999-r1.ebuild 7621 RMD160 40431f3ab44e12391340d4df642b16657ed10337 SHA1 9ae741dbd068d17bd3b710ef9b8855baf94d4760 SHA256 26c5812bd7278e64dd87438f82ac0019d114f747c277e1f2c21c3e3d1355afef -MISC ChangeLog 51334 RMD160 adebc7062ebd846dcfdf64adaadae7a90a951d81 SHA1 028be8e748365247487797a5fc3affbe8264395f SHA256 a687fbc6e718cba516b9b08b0f1b282b598623fcd360b18ff22103ee8466a552 +EBUILD ffmpeg-9999-r1.ebuild 7464 RMD160 a30d8a8395996b1e544d3ed58201c78995903bd9 SHA1 1943d1311b5b68446a4843acd15fa71e038bfb53 SHA256 3aa313e722f951033ee0463b6bcd67ce970b46389e1e07cb8a6fa16e25a5703d +MISC ChangeLog 51494 RMD160 0bfbd2d2526c947e1cbbdb88452db390af47fcf5 SHA1 e0a85b3ee705392cc8ca45038b3365ba36a0727f SHA256 2a18eea60ab5e8f7fc955262aaa0dc80baf7b0591e24f63ea36f241988245adb MISC metadata.xml 1876 RMD160 3fed4cfedd4cd693c1053bd4ea90c75260aa2815 SHA1 827e1fc2f346f5c8695d45c4697dbcd4fbc47462 SHA256 a2b6f4fce6ae13c3cdc007124cea38857942efeb7fac9779487d087b6068ca52 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAktrJfoACgkQvFcC4BYPU0rCNgCgubtATdPzvFkp2hzjgr8Lo5qw -IcIAn148eOYq3oW6SqZFPzhQkEd2nQ5H -=An93 +iEYEARECAAYFAkuXgXkACgkQvFcC4BYPU0phIQCgpaq1wDGt6838jPNABaFHebI+ +wuEAoMcxeZ4ADnmhHALKKGEbnmGbq16Z +=i2Wx -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild index ce887f5c0de6..6b2365700660 100644 --- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.29 2010/02/04 19:54:28 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.30 2010/03/10 11:24:36 aballier Exp $ EAPI=2 SCM="" @@ -129,15 +129,10 @@ src_configure() { # Decoders use opencore-amr && myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" - for i in faad dirac schroedinger speex; do + for i in gsm faad dirac schroedinger speex; do use $i && myconf="${myconf} --enable-lib$i" done use jpeg2k && myconf="${myconf} --enable-libopenjpeg" - if use gsm; then - myconf="${myconf} --enable-libgsm" - # Crappy detection or our installation is weird, pick one (FIXME) - append-flags -I/usr/include/gsm - fi #for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do # use video_cards_nvidia || myconf="${myconf} --disable-decoder=$i" |