diff options
author | 2013-03-10 21:32:05 +0000 | |
---|---|---|
committer | 2013-03-10 21:32:05 +0000 | |
commit | 3b39a1875bdb38e6f99a1ed5882efc0ab15f6467 (patch) | |
tree | 401941533c31e483c3cc2800fbed6bceabcd5afb /media-video/ffmpeg | |
parent | Fixed linking of shared libraries (bug #339923) (diff) | |
download | historical-3b39a1875bdb38e6f99a1ed5882efc0ab15f6467.tar.gz historical-3b39a1875bdb38e6f99a1ed5882efc0ab15f6467.tar.bz2 historical-3b39a1875bdb38e6f99a1ed5882efc0ab15f6467.zip |
Restore --disable-asm for ABI=x32 #427004 by devsk.
Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r-- | media-video/ffmpeg/ChangeLog | 6 | ||||
-rw-r--r-- | media-video/ffmpeg/Manifest | 24 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-1.0.5.ebuild | 3 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-1.1.3.ebuild | 3 | ||||
-rw-r--r-- | media-video/ffmpeg/ffmpeg-9999.ebuild | 3 |
5 files changed, 28 insertions, 11 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 858d9d173fe1..56c731469512 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.617 2013/03/09 12:07:50 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.618 2013/03/10 21:31:58 vapier Exp $ + + 10 Mar 2013; Mike Frysinger <vapier@gentoo.org> ffmpeg-1.0.5.ebuild, + ffmpeg-1.1.3.ebuild, ffmpeg-9999.ebuild: + Restore --disable-asm for ABI=x32 #427004 by devsk. 09 Mar 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild: factorize some more code into ffuse diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index ee7d4075fa78..364ecf3bf400 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -9,15 +9,25 @@ DIST ffmpeg-1.0.5.tar.bz2 6449133 SHA256 1f1af23112e2da8403abce605749db9111d45d2 DIST ffmpeg-1.1.3.tar.bz2 5812644 SHA256 a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8 SHA512 56a4f1b77f55521e2e129155b10024d02a919b8429a24ef2103b2242e2782695e05e032bffa65b3a90326bee0c274dba5869d0cfbba3f13c11c0ae328ba4ef26 WHIRLPOOL 066b1d1e1eee7d96b32b4005760eff34c4d6878821ad5037e4d7b2068dcbf9bd94c83d123a033dcf0f1840c63a4e3e94d011bbde0ce47f2e020644edfe731f6a EBUILD ffmpeg-0.10.3.ebuild 8635 SHA256 7a93b57018947a7c57d3829c092aac4ee8e3b554c1116fd2fc41f4b4582bc7c3 SHA512 0a64ec7ef72af03d3997bc48191a4b8cf34ecc79d8cc4648a46e0ea303c38ba0bfe5877937328e7eec32950a6371288c7d4613eb14914bbe0f26f961cbda2d25 WHIRLPOOL 1e65a3790fa9c111c2266d5a2c5f6333ed3b37518dbd2a96d0ac7f6d969feb793430c7a79ee79de485d4c2e3d1b6da103936f22125ec87b061f319ab7bed4fc0 EBUILD ffmpeg-0.10.6.ebuild 8948 SHA256 1875d99d03d01cec646e514432fe402717e5c5867fb40a69c8ca21f5b765d495 SHA512 abf9c5e826fd3a915cc7de84bb7e75cc4455d7cf94d4e630204e05dd9f82e0bebc0a9bbca599dcc0057e6836bf821b520f9b1f228acd4834675826166d87ffcb WHIRLPOOL 7a0d190140b3a6c8a797fcdda06d8ac854ddcb4b2b603bcce027fe75f191f63f87addb5fc06e90d134988824626170bbd9742201ce47ce077a97724d37e937e1 -EBUILD ffmpeg-1.0.5.ebuild 9574 SHA256 45068dbfab396fae1f89f6c7fb6ad6b0d8fd493216274c43c0970b021ebcd9b4 SHA512 6140bfb6075806b176ca1f9150138a3f00ccfb82d486e7bd145f5eb20b9d4719647e595a8f23754d1dc7efabcabe8f9f9e1a9ba7d1c78be39f8e34e29d7e6151 WHIRLPOOL ca4e190fecdf1dd716a92f86d666d37dfb098760a2aaabdbdd4073d189a71abe27975884eb4d432b3fc186d7ba115fe89ea8c5aa58b6fc7810adabb85b3c758c -EBUILD ffmpeg-1.1.3.ebuild 9542 SHA256 7aef1b9be818531a8cf69d7ffb8259195eef10dadb0da5b7381241f9d4a0d8a5 SHA512 27de8effad6bb2e1a117285c022149440b9dd13256c9a3a16b63ea961c95fe83b7c8d22f504b841fbbe3c90254bdd3e736c262365a307202370db4ba038cbf95 WHIRLPOOL 03340311eb88594185ab9f663f4049f47eb9d7838d1095d5051628918cb8c4698e405c82f29c6f8ab9c5fde28e0b52a1a18f64c32f0a322e39fc13362f7b82ea -EBUILD ffmpeg-9999.ebuild 8866 SHA256 c26fe37c008c6e14015734aa63beb061ca1502ca94b428ef82d18d0df6cab6d1 SHA512 86fbf2abcbeb10ab7b9e5559ab18c7ed1611eed24dbf4a5e5872696faf18780f627d280019e66281b90112e484862bacccf818ba383c02abb76cdf2ce10446c9 WHIRLPOOL ba3809066f2f8d0dc6cc5e51cdb854fff034910ec79659ed13a520ffeb6d1ec9c3389791bc26252b94c927cd4f8130366179ee01a77d7b724ed89914c9410750 -MISC ChangeLog 87159 SHA256 96f191c88dd6f3b57b4676fd7e3aba7e9d773dd95bba27a4dd15207fd6fe571c SHA512 52eda607054f216f45a64348ea9d26a5c199625463fb52a256cc07f7c96fbd24c5d5821db66cc39f7cf9a89e67efdaf6be4dd653aa8a011baf91c88a9fa285d0 WHIRLPOOL 8857b599891e32b3de51287a9eeb8b49191e90520c220a1f8679d6c9dc71d8e666255fc647cb18b46c8a9f5e47bf1c8381324700c3b7c0330f4e740a9da2b181 +EBUILD ffmpeg-1.0.5.ebuild 9631 SHA256 2198a0e22f18b7d9e35816bb9943e1dde6ed68d8e28336b80625ef976689c54f SHA512 14338567ea037d25fc2e0e578c6dc259328ffcbaa48b8923382b74ab49d18eb9b574d9a3ab19f1eb9acfe1dc62c20d3e3dc706a00ea58bf64420fc98cbb66b90 WHIRLPOOL 3aee8d49d2f03bf778d14553a5d35f866a5a45dd4dbe8b31b8b8604e2477faceaf41e842379647acf02fdd55fbe4b894e1c3f8d91138803ea4f653b49f327e8d +EBUILD ffmpeg-1.1.3.ebuild 9599 SHA256 d0cd93008372c19aaad92610ded98d8da6b7232345b8152b6197c905a5c12763 SHA512 ab5a56efbf41957f63db90a92f248c26187ad8348c9488ac063b7e9537a5c6ac42ecfd0ab5e7ddd4c134b6204cdea822237e275080929f8114e7380051a90289 WHIRLPOOL 3043efc270bc20c0797682300041919609f0b68c0717503a62f755020e946b372f7feb1d16331ffdec141956369439e1c50a297a73e5d643b7fc23104dcb670b +EBUILD ffmpeg-9999.ebuild 8923 SHA256 0aadda4e7ca69b51f4c6f1e7adbe6d501aea64cbf6a1245af71ea0e537e3755f SHA512 7647bee2b1a97c08807d999b0fc58bed2b5fb70aa2c765839f77f165b33be07dc4839e7f6256447fa1964f10f8d976fc705a50e077b22b47b169039e847a4d82 WHIRLPOOL 9e90569439712fd71d2bcd534b431e99cf476b7f5a79577828825e9f61f3c43d9c46a8fb53d472adcf5b48f6df91b53be67b89c0d660dc22e18a2e72b0150d96 +MISC ChangeLog 87326 SHA256 3468be188635471179cc8b1fa8872972490454d5ae7f102e14b36daa9fe67918 SHA512 932586bc7957617caf5d7e684dc94c59f92b095b309935787d0e0a91ea639a06dd5c1bc2c6c766d8474ab38baba6ee8bfebdbdcda9ce0f9447d721260d6c5a98 WHIRLPOOL 0f39cf224809abd6d21523c81526c7a928cb9ad86bb7148b4583e062a5f9664ffd13dc214cd866f8cbf08584d9489001ca339cdc50892f829cbd7f087404edb6 MISC metadata.xml 3725 SHA256 b0eee9c78de338fc58bc8295e5da8079fe450229703dce3bf1221d711c00a6fe SHA512 88dfc6d61f50ea554ae3189f3138ecce3dbc07f4abdb786a4b77bee43c4057c4530bd313697e82b280301ab58bf71fd0eb0db5670392f8336f67681ae50c1389 WHIRLPOOL a4d9468f66d5d2835289fd7aab1d83b07ee34f864717254531f741445db12ef1fa35f28ecef583a887e3e6e8ed3ba7499d7189490ce61f10c1b34bf7915aa829 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlE7JhcACgkQvFcC4BYPU0qd+wCfW7hEuLsMtXnv8Auaxe9VxTUW -DwUAoJt1rFphbYlIA5fUyUhJ6W22/soN -=/prW +iQIcBAEBCAAGBQJRPPxoAAoJELEHsLL7fEFWIZwQAJHA+xbxtD6DYcRivRAevi4x +K2QL9QLJ/cbvgwBJg3nc61yDMkDk/SdlfRWSNmP+u0EJ8+ibO9T7c+gU4UbcTXh3 +c1rrASbcv2pcbZd9oUSOADlYpmMgMCKjcb3Nf0jdu/3KD/5kR6qWXaBBqUnS0iS6 +XFnkXgrujTLmvD9RU6C8a7vgCz8v7RoNZ1obUrp4qx+7/GQKa6x3tZI1I9YeZPfd +H40UZ87HPMgjmzns0Ms9RGW+jzCb1XYtQWhV5ai6GnFeumEwXLPUAW0De2b8lVRF +TDN7AUoPsQIe9KZzNchIgArFLS0MHtsELg+R12pdyZrJQn38v3yk6Ke19NW+6tCX +6tU5VeYorzfNr5qY045mc+9KxKWqoO1P6vWu99S39EagfVyBuN2achJ1bvfv8jIK +/qpANTU/AESuvSxxmInIOgU+czwM/tPTmlfmuseDGA045oFdaKg36tpT+vaQWWn5 +GjHzc2/TVkQhZqi3GywD/0oSulsPz8zgAV+MCzRPtaPFwNOcVvstBtUGFjRTH2gC +xSJZa/uKFyt/9cVxatX7CyUtkFWkb/0ROB2N+zK+xkrCdbwff+ZXTliGtylUtrLM +sc7pC02jw77Tc6uq4T1GbomKnXFar+gJRsO8A3HV5QASmr7zi6nGFZmSL+S4ph9D +YP/SzVeWBqBRtAeUr4PS +=s09p -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-1.0.5.ebuild b/media-video/ffmpeg/ffmpeg-1.0.5.ebuild index 46e4deff2db8..b1c1e183d518 100644 --- a/media-video/ffmpeg/ffmpeg-1.0.5.ebuild +++ b/media-video/ffmpeg/ffmpeg-1.0.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.5.ebuild,v 1.1 2013/03/04 10:58:00 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.0.5.ebuild,v 1.2 2013/03/10 21:31:58 vapier Exp $ EAPI="4" @@ -216,6 +216,7 @@ src_configure() { # as the provided asm decidedly is not PIC for x86. use x86 && myconf="${myconf} --disable-asm" fi + [[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004 # Try to get cpu type based on CFLAGS. # Bug #172723 diff --git a/media-video/ffmpeg/ffmpeg-1.1.3.ebuild b/media-video/ffmpeg/ffmpeg-1.1.3.ebuild index 87c693e6790a..a4d2c8148373 100644 --- a/media-video/ffmpeg/ffmpeg-1.1.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-1.1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.1.3.ebuild,v 1.1 2013/02/23 13:21:34 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.1.3.ebuild,v 1.2 2013/03/10 21:31:58 vapier Exp $ EAPI="4" @@ -213,6 +213,7 @@ src_configure() { # as the provided asm decidedly is not PIC for x86. use x86 && myconf="${myconf} --disable-asm" fi + [[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004 # Try to get cpu type based on CFLAGS. # Bug #172723 diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 867cf55dc1b7..1f942c2f2461 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.123 2013/03/09 12:07:50 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.124 2013/03/10 21:31:58 vapier Exp $ EAPI="4" @@ -210,6 +210,7 @@ src_configure() { # as the provided asm decidedly is not PIC for x86. use x86 && myconf="${myconf} --disable-asm" fi + [[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004 # Try to get cpu type based on CFLAGS. # Bug #172723 |