diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2008-07-07 20:39:09 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2008-07-07 20:39:09 +0000 |
| commit | 5909c475727de4763aca4e8cfaa79f80977cba88 (patch) | |
| tree | 5f47b6f2078aa78d8afd2a583e1a2ef49e437b47 /media-video | |
| parent | Fix einfo for bug #207798 (diff) | |
| download | historical-5909c475727de4763aca4e8cfaa79f80977cba88.tar.gz historical-5909c475727de4763aca4e8cfaa79f80977cba88.tar.bz2 historical-5909c475727de4763aca4e8cfaa79f80977cba88.zip | |
Fix build failure when disabling MMX, which would fail to disable MMX2 code on processors supporting it, resulting in #ifdef spaghetti build failure. Bug 229981.
Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/ffmpeg/Manifest | 14 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild | 4 |
3 files changed, 11 insertions, 15 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 7a9ce6a87cde..95898c319551 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.219 2008/04/20 07:28:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.220 2008/07/07 20:39:09 loki_val Exp $ + + 07 Jul 2008; Peter Alfredsen <loki_val@gentoo.org> + ffmpeg-0.4.9_p20080326.ebuild: + Fix build failure when disabling MMX, which would fail to disable MMX2 + code on processors supporting it, resulting in #ifdef spaghetti build + failure. Bug 229981. 20 Apr 2008; Mike Frysinger <vapier@gentoo.org> +files/ffmpeg-arm-pld.patch, ffmpeg-0.4.9_p20070616.ebuild, diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 237922a59848..cfc4d888f596 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 0.4.8-gcc3.4-magicF2W.patch 994 RMD160 4192e2537d220d4b63c55bdea36ac7f5532d8a6a SHA1 07c79c6680ebe0b1a695394ba4d24abb503c4b46 SHA256 3d359f8483903dcc876be0ee4ff511d63a8cf57fade26d58f72e4a3ec0694226 AUX ffmpeg-0.4.9_p20060302-amr-64bit.patch 1161 RMD160 c3e17a8e8a3e501ae9ce8b8e455063444d1bc15f SHA1 e4f280a2934e238529ca8b0d8d2abec2638d9fb1 SHA256 f993ac1ad11e254d846fbd0b3f73f81043551fce90438fdd196374ca9ece6c9c AUX ffmpeg-0.4.9_p20060302-fbsd-flags.patch 366 RMD160 ae6a9b23e3a5cc018563a9f023273be821bab44a SHA1 9bea2c97d2a2a0ca26d6474699ef449948b82d66 SHA256 0af48d342f5001d856ba850b7c8ecc8e46ff809b765b28adbb1c0674b4c2c414 @@ -21,13 +18,6 @@ EBUILD ffmpeg-0.4.9_p20070616-r1.ebuild 5689 RMD160 d3098df2faf6ed8bb446c7d23c03 EBUILD ffmpeg-0.4.9_p20070616-r2.ebuild 5761 RMD160 8deab60e9301c695dea9c631b69dcb79646ef932 SHA1 825b44d0b32a9e372f3505079455111513ef3a19 SHA256 0eceeb8a2215ccb577e97c4138bbb3285023fc45e49c4b73cac5200a5cab7454 EBUILD ffmpeg-0.4.9_p20070616.ebuild 5544 RMD160 988fc4648a3d3f1f97299ecf487ade95e851d230 SHA1 5851bdf4449ee383236d668205b06baf746dcd70 SHA256 002663f87e8281bbd7395ce56e97fe24db99ab8273faae65fa601b9bb737d083 EBUILD ffmpeg-0.4.9_p20080206.ebuild 5209 RMD160 be8038158c780b31842f0054c7bed3148922350e SHA1 0ac4ef0f819d8e9e75794a3ed01c24f6b86d967e SHA256 e5be2b691b44145a32206a4724c6db47cb79bd7de1ae0f1d7fafff0442bfe61b -EBUILD ffmpeg-0.4.9_p20080326.ebuild 5229 RMD160 e8af483be74bd89eb150797f4f3f76c9552684f9 SHA1 e6308812e00441cf537a958891fa4de681fb821f SHA256 108fbeeb27a6268d1faf572b106ace9cedf149821f07598484787ef4f600867e -MISC ChangeLog 33394 RMD160 360347e6e950d5bf54157ac69ff6b2f50d7d744b SHA1 2e1aac5a9b7a09a4ecbb48e536ac82b216d058b5 SHA256 f041beb1fed21c201bf94db18f90a907e4e4e500d7676fcae02cdd036190d5cb +EBUILD ffmpeg-0.4.9_p20080326.ebuild 5246 RMD160 a52a5cf821b2026f7dcd09c452c97b90bf58496c SHA1 735aefd0a3c019246a532ed14210ca33834200e4 SHA256 91cf06581bcfd9137dfce8c9d68ab7cf62f35959d257754b2aeaf6359fa1e580 +MISC ChangeLog 33651 RMD160 80046502121e375c7d37d486bad46129ec2f8400 SHA1 7d66ec61cde9aea4bad3e992707a2d332a3f00e1 SHA256 faa7064ad0aa4f8b28d3a8814aa1da47572a84b7b05bbdb968750276a1204b0d MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) - -iD8DBQFICvCtj9hvisErhMIRAsQdAKDWBtHfNGQUaReSXv4jpqswUjnrDACfaLXY -Cm++MnBbf2jG8tR5QT4Ks6I= -=qHJe ------END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild b/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild index 4da5e7af78ce..5eb2bd8d3137 100644 --- a/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild +++ b/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild,v 1.2 2008/04/07 22:14:42 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.9_p20080326.ebuild,v 1.3 2008/07/07 20:39:09 loki_val Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -71,7 +71,7 @@ src_compile() { #disable mmx accelerated code if not requested, or if PIC is required # as the provided asm decidedly is not PIC. if ( gcc-specs-pie || ! use mmx ) ; then - myconf="${myconf} --disable-mmx" + myconf="${myconf} --disable-mmx --disable-mmx2" fi # enabled by default |