diff options
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/ffmpeg/Manifest | 20 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild | 6 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999-r1.ebuild | 5 |
4 files changed, 23 insertions, 15 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index bde9532fbb47..bc035ee79ebd 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,11 @@ # 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.339 2010/01/26 15:00:41 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.340 2010/01/26 15:56:13 spatz Exp $ + + 26 Jan 2010; Dror Levin <spatz@gentoo.org> ffmpeg-0.5_p20601-r1.ebuild, + ffmpeg-9999-r1.ebuild: + Handle -march=*-sse3 properly, bug 283968; Install the manpages, bug + 288467. 26 Jan 2010; Dror Levin <spatz@gentoo.org> ffmpeg-0.5_p20601-r1.ebuild, ffmpeg-9999-r1.ebuild: diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 0fa21c4eaee0..e71a39dea5d7 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -7,18 +7,18 @@ DIST ffmpeg-0.5_p20373.tar.bz2 3087600 RMD160 6a960e0837f419c882c7bd18c91f582df0 DIST ffmpeg-0.5_p20601.tar.bz2 3103450 RMD160 0fb6ebf92673510ab4118422dcbb7f96b0d47e4f SHA1 38211d48ffcab03c83d0cf2043e3c931041a6928 SHA256 3e79c8245ab66d3eda907d5857a9cecda164a9eacfa83e52322760260519ade4 EBUILD ffmpeg-0.5-r1.ebuild 6579 RMD160 5e83ac138a45d2f52b16ee72c1ee6ff3073d2e21 SHA1 1c2517f10be827668807cf051b7c595162534eb0 SHA256 84d0af467747bd359582c4e7e90e61edf6eb6857d87905228fc1411e7ce00630 EBUILD ffmpeg-0.5_p20373.ebuild 7684 RMD160 6706941ec4346afde3a434adc60957874674b871 SHA1 35d8227d3103c57ab9973c4eb0a00f32d2458be7 SHA256 1dfe7fb023dd73247ce01fd7d44e05746b3fccdab6d0ddb87d5ed1a97e3934b3 -EBUILD ffmpeg-0.5_p20601-r1.ebuild 7777 RMD160 4c6ed67d658b0bc1840470fce4a31a61ae9f6e70 SHA1 ab9ee712fa24f4d2d66c90fb888061f822d9bcfa SHA256 9951088582b7361a63eee8b0276f058f0b701bbece7ab8aee4cae9378bbe0506 -EBUILD ffmpeg-9999-r1.ebuild 7625 RMD160 7cbbc005e9971172125482f64514880aca15ac21 SHA1 bd52bc63218cd477f691c60fd80f8a26c0565626 SHA256 84c6ea3da8448960a31bc7a0400915ab641ff2acdff96eaebb81adaa402eb5b4 -MISC ChangeLog 50664 RMD160 0b95260c2da1b0d4c2d4633efec7b994c7a611d3 SHA1 1a6359a7a12bf68d41ed02f2cc21a4d93da8dfe6 SHA256 98cee91c72e9bb998830a8e0820dd30aae8f576c5a781ae88738715c9d2fac73 +EBUILD ffmpeg-0.5_p20601-r1.ebuild 7887 RMD160 b291765ffc2f18d08b7e28f8b33f88d4597dd90e SHA1 96836583d0824ddb24acbbbd7fe46ba5377db9e1 SHA256 5938dd35b44622801fe9bc0b87592e0b24e3605fe74d4eb55fc8e1393f9ccce7 +EBUILD ffmpeg-9999-r1.ebuild 7690 RMD160 4eb2870463b468d9a91ece45fc30e770b2e5e9c9 SHA1 60dab69394ca5768a9c91494f2494ef7f8a49867 SHA256 a73f8e63622a26a9222bd77634d71290099e408e8ea0b224879561fdd34565cd +MISC ChangeLog 50845 RMD160 9331a9c4804ade6aa9ab363bf9dbdf701d7e4551 SHA1 39116d06bfa2c13dd6a801a1b3e3fa9b7b9c18b5 SHA256 c9840ff737df51a6423cbf6ad6b868e30607b41873f6ef4b5493acb8734cd357 MISC metadata.xml 1876 RMD160 3fed4cfedd4cd693c1053bd4ea90c75260aa2815 SHA1 827e1fc2f346f5c8695d45c4697dbcd4fbc47462 SHA256 a2b6f4fce6ae13c3cdc007124cea38857942efeb7fac9779487d087b6068ca52 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iQEcBAEBCgAGBQJLXwOhAAoJEAWF714uGAc6tj8H/2jXnnd+ASYmWDbKOAUtMFx+ -Nhh/yNdFnsmF1O9ntcHWPjiBIH3MOtZpGma7ByrNKoKBOWpBzc9qCEYOGSsrZibZ -gjw8dLbcRk87aPwdj0ipiuqujEzXnmaGugr1qRx1cijnypkqNA12e/bNPCNPCSv6 -cfkj6czkraNPnVlnZclCsdiU0dZbcfVXLSPNKuIU7PFzo2owX0tfsEIYcQeD0uQ8 -8EpAOvJwQLFga42G1e4KJLeWKodJYBiTvOqymgCmoLUEuBA+S/GMgjSP+wqjwptI -VBiubt8fWJj3hEIr9+NyRRl6vCXQZO3aC3OVHtn3gcNRgo4EymvlyDMrWP8eO9A= -=eMZv +iQEcBAEBCgAGBQJLXxCmAAoJEAWF714uGAc6zfsH/3TYwfLXRxto0lmfUtHe8AqT +R0P+uNKgPksenyLIyWCfsJlneakL/A+4fMOvOR3krzXcFjoyTaxKvD6oJrDRUqiC +CPgjP1UUaxKWN0Si6F7BoCmQXOXHU+LmYaMKclqkOkRKXCQjY+ObXDXCpOoRjm/w +jS6grmr3ZN6JowVlWwstuRdrclwfOxF+SbfEVSxB7KsRmhXrfeRpkN8F1wrWtDi0 +eHyjEm9C9wdiiQ/PreaooObt+NAI1Pp7z904Luolg6AoZrrE7B3/5cgNHJUSlXH+ +PZnNnc91YWmF1YfwHUqGy68nBt2MHbvdt+R1Kx4ZpVHA+7RGcvz0aeUxGVK+tUA= +=qSnn -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild index 8cc4cc2efe65..2237ceb7afa4 100644 --- a/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.5_p20601-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-0.5_p20601-r1.ebuild,v 1.3 2010/01/26 15:00:41 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.5_p20601-r1.ebuild,v 1.4 2010/01/26 15:56:13 spatz Exp $ EAPI=2 SCM="" @@ -178,6 +178,7 @@ src_configure() { # will just ignore it. for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do [ "${i}" = "native" ] && i="host" # bug #273421 + [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 myconf="${myconf} --cpu=$i" break done @@ -205,6 +206,7 @@ src_configure() { # Misc stuff use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables" + use doc || myconf="${myconf} --disable-doc" # Specific workarounds for too-few-registers arch... if [[ $(tc-arch) == "x86" ]]; then @@ -238,7 +240,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install || die "Install Failed" + emake DESTDIR="${D}" install install-man || die "Install Failed" dodoc Changelog README INSTALL dodoc doc/* diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild index 3ae8cc72fba9..aaf3974aea1e 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.27 2010/01/26 15:00:41 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.28 2010/01/26 15:56:13 spatz Exp $ EAPI=2 SCM="" @@ -174,6 +174,7 @@ src_configure() { # will just ignore it. for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do [ "${i}" = "native" ] && i="host" # bug #273421 + [[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968 myconf="${myconf} --cpu=$i" break done @@ -235,7 +236,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install || die "Install Failed" + emake DESTDIR="${D}" install install-man || die "Install Failed" dodoc Changelog README INSTALL dodoc doc/* |