diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2015-02-11 13:45:21 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2015-02-11 13:45:21 +0000 |
| commit | 6dec184c72184d1fc2048f701d2b6c6f84e191ab (patch) | |
| tree | ad608e0931f73783826e76c67be4a2054fac94a2 /media-video | |
| parent | Mask ffmpeg useflags with unkeyworded deps, bug #510340 (diff) | |
| download | historical-6dec184c72184d1fc2048f701d2b6c6f84e191ab.tar.gz historical-6dec184c72184d1fc2048f701d2b6c6f84e191ab.tar.bz2 historical-6dec184c72184d1fc2048f701d2b6c6f84e191ab.zip | |
forward port keywords after masking optional useflags, bug #510340
Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.16/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/Manifest | 14 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-2.2.12.ebuild | 4 |
3 files changed, 18 insertions, 5 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index ac8c7c92d6da..0e3db93b8643 100644 --- a/media-video/ffmpeg/ChangeLog +++ b/media-video/ffmpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.825 2015/01/31 23:54:51 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.826 2015/02/11 13:45:17 aballier Exp $ + + 11 Feb 2015; Alexis Ballier <aballier@gentoo.org> ffmpeg-2.2.12.ebuild: + forward port keywords after masking optional useflags, bug #510340 31 Jan 2015; Patrick Lauer <patrick@gentoo.org> metadata.xml: Remove unneded useflag description from metadata.xml diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index e3c745656972..bfc7699648b0 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX dirac_arith_hardened.patch 1184 SHA256 80e0ffcfd9db67f6a15df93f081e4eae24b0f6879a394c8d1ba6a29b239b62b4 SHA512 996e6439a984d87adb2f42afc00d3011324e0752bea50bf2708a701cf21ebde53ec3a2051c0c85aaa7d04a515088aa8e54d3845cdc125c5be8a3e98f2e7143d0 WHIRLPOOL 6ac462685a2eef402e583b1778f7a5c241a0a47a742b22531b5137bea4c8c977ddd2145fcb925dd0900ee79810c7dbc49c6ff1d358b77e216f33a68c790db060 AUX ffmpeg-1.0.8-freetype251.patch 2008 SHA256 b52b832ad8b35ba79a1cbc5c592510d874e321de2ce80bfa52e21cd74aec6404 SHA512 e56c68980a52d9ff65e92267cf23ca5170c7ea7ec3100012af19f598c4fe64e6afac53100486edd5fc14ace31baaea01ddf552c74b9138c067cf95672e86c17e WHIRLPOOL 7a8084726afae99de24da2ba04889bb11993b59b070316ab2c9b20a38c59d61abdfa625888433e253be0c948cec39127c8b43d66f695ea48bedfd215cd03e392 AUX flashtest.patch 2343 SHA256 fcd05d4ad3f8cc6dd64a55c83279bd5738002100f1cfdf2f4ca8c9547f5b9a28 SHA512 e2994e3b25b207021e00ed982a82efa8ab2fdf2499f5ef97b7f280a0abd33fac639b7e26c26b5ed7dac70931c009b7062b6c91c4b4b38d30a29f8b364a837ba0 WHIRLPOOL 78c41fd6dcd7f698b92ee6f9ac0c5c5d80c8e45c3dffb8c2bff72f0802084b78ce601dd716c6ae7b6bc6641b4f98a1ec33acfe761a13bcfaeafe3677fa6e3ee0 @@ -13,9 +16,16 @@ EBUILD ffmpeg-0.10.15.ebuild 10048 SHA256 8d7f4df870bff974ede8e658da688bcdc23b1a EBUILD ffmpeg-1.0.10.ebuild 9780 SHA256 3241f382715ea0e014e8b60de9f0f4fc9a5a8df4eabc1dd3927f194b6b92842e SHA512 851c95e17a6053550bcbb11b09950237f0631d61c99c8cd7834e4a7f15f4741b00da4b42c7479037c71817dc653de22cd5f2621727001c14f425c0500c10eb8d WHIRLPOOL d8fb36784db5b7188c38c6f8eb5d406515cdba9c36fdec6f9d34ce57eff85b64ef3fa40cf71af7e6bbcc59a32acfad9ed49da11c7fceb7b193d5204ed683ad45 EBUILD ffmpeg-1.2.11.ebuild 11047 SHA256 e54132d922bccc0ad5d347495e0dbc47b734aff3fa5c0bf5158eda5e6199ca87 SHA512 1f8bbdcaf16abbb551df5996b569bfeab3ba1c9faf99de3d712b21fbfa0761671c1527a0097c0be12cd59eb8b03563f8214ba0afbd949f18bd64a74e7dfe3190 WHIRLPOOL 9416427f4ab8da4a04d682185d65a78a78140e81035268ab42b7bfc65ced1e191109e28b2037d8e67f1b015da077cb5501febde187cf2f9a43bbcf230d5f3f7a EBUILD ffmpeg-1.2.6-r1.ebuild 11090 SHA256 04e0bd9aac8037358acbcbdfde2f50ec13a3dde1f76c62c1fd0f5703ff095b31 SHA512 7fbcada3fcbefeaee4603b874087b4ace395e0a28f51e8e3a73a0105bf79b8872f02636dc82cd10f9f68f0203aa6adfdc0c4071a89140df23092e4581dec2baa WHIRLPOOL f7b7c3725e8d61f1076c3dc4afbefbda7d72d626b23d75b95ff4924e3c9b448d06e711c42bad65ec0410c3267f5051e4212de4aa50cb5660a435a9ca98436b95 -EBUILD ffmpeg-2.2.12.ebuild 12699 SHA256 1e430ee878261dde07e609bc6902086b014e01642e23cdec9f90d76fb49bcaaf SHA512 dd1e48c3b2d6efb06a7108d905e06e187e6375aefcc529d153878a9c4bbd940dac5befb749668652d2dff12282519f55746173835cdc305ec74f25fb44abf161 WHIRLPOOL 24eab252ca171eb7be66c02b85ca3bd879ba2020525fd41662b2d57e4b673b0d7ac6b15d12cb8bb597523562a356a23fa2228e7625002eab60dbbdbb884538e3 +EBUILD ffmpeg-2.2.12.ebuild 12745 SHA256 b50acebb37c7d031c4b089a5321dd8b2a8e8bab93a7066bf10145b2e0aaf247a SHA512 2b421d0c856c6fcefc5b5be0ec68cc3ea32fb3d85ec1582d047a8a027bd71d903ca689f419e97e42002f8516f97b0c036212a8de18b7cf0c83884a3a2ccbf603 WHIRLPOOL edc9c1f64789606ab09c0e59bcae412568317704c2eb60e60be38eec5f011cb3bbb69849237e5979bc2fd6e30e8646feb76cafde3f0a8daf0ebe8c8c4bd06e97 EBUILD ffmpeg-2.5.3.ebuild 13170 SHA256 2a15f3059c17573de22426f05d4ac92816f74b58609c015bbe048713bc554a3c SHA512 e2942192a9fc9d9f56f7ee67140b68443fce54897b2a9803953d0754d186a4c743151a9dc6fca2dc829e471061caa6ecd56636e5a104399a327b054e983eef1e WHIRLPOOL b04fcb70986854c6f96c4cef296d207f49a8019c88ab5186db9ea25604c109acc0b3e565adc81a15eac7a0e9c840b15c53fca15709f0ca9991af1b20f379f22e EBUILD ffmpeg-9999.ebuild 13171 SHA256 0af0581c0e5195302d04f2bd81598af17d5a7d54dc7e7b37b27e73f4066dc069 SHA512 1c52624c4aca012b8ddaf4e4f74d5b460251837ccd72ad270962db007c732175bdd1e7a8e0c946e576d7d602449e02c031616624c254c4703b01c9f4fbcdbf67 WHIRLPOOL b2d7c11475f4394bc0049a197ce973d779829b798873ca4484bc1e3f34dc220ac8a400c0d80604fcec73cb1203b500508ea292e4c8a9cf64fa4ec23f2a529114 -MISC ChangeLog 1242 SHA256 ef12248be1c2bc580f20bf2b959b807cca7ae35e8bada7573ff1d20b0936fbe3 SHA512 a0ff5242db602e1cdc381c706f8c6c37744679098d390591f2307c375fd7d948fa9f3e0702b42677a58a80fbd58e6f5d24afa80b3b7935bcde0b4cedd916f922 WHIRLPOOL ee209ec85ceead7642bdfed4ac96dbb40e15efb1c99f5aeef24a887dccc7519d0307eedb59b48d427b0debc68f97eeeeba9b00b89f0fdf8d3228bfae29cb7e32 +MISC ChangeLog 1387 SHA256 2c882876cf92547777098157ccdd2674b9f162c44cb94fa9701351f1e932e58c SHA512 4428c9a97065541abc199568cda303bdf42369cf88cee74d347bd626759b3f45412ef09858e4030c6138829cc47979075f942a0f167d45c583c58580eb1363af WHIRLPOOL ac843a0d37e19b0ab274ec81fa2fb968c509b596431d6eb26d017bbfcd4fd35766c4d6963a0622e14977a41cdf0ff5f847e05500f43d100c37c2da699b6b3967 MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701 MISC metadata.xml 4268 SHA256 070123d230f117598324822c8530d41b9f5b03afc711c430b0a11355b47af42f SHA512 ba933d5c0acded55f9ca4f54b617b201ac3659bc7daffe7a069d0418c65b9a2648a393d8fd6cafb41f6a80d55d279e58b025b3c91fda41e8ed96d33319c81ee1 WHIRLPOOL 33d8c62f6fa5f90e7157976fb689833a9019bbcffb1ecda47045b537aaa14235c77d2d107ff4c59497b5e9dd70981e77fa4d6b0a266843ca4d2a877ffd863586 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEAREIAAYFAlTbXO4ACgkQvFcC4BYPU0pHNACfcTnUd7qMsJBoQXpNuwCuvmqq +/nQAnRm56pLomGzx2oJBO/NVYnsrWbjv +=49Oc +-----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-2.2.12.ebuild b/media-video/ffmpeg/ffmpeg-2.2.12.ebuild index 544a0a0af566..234c92d30d8b 100644 --- a/media-video/ffmpeg/ffmpeg-2.2.12.ebuild +++ b/media-video/ffmpeg/ffmpeg-2.2.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.12.ebuild,v 1.2 2015/01/30 16:40:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.12.ebuild,v 1.3 2015/02/11 13:45:17 aballier Exp $ EAPI="5" @@ -37,7 +37,7 @@ FFMPEG_REVISION="${PV#*_p}" LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )" SLOT="0/${FFMPEG_SUBSLOT}" if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" fi IUSE=" aac aacplus alsa amr amrenc bindist bluray +bzip2 cdio celt |