diff options
| author |   Tobias Klausmann <klausman@gentoo.org> | 2015-07-04 13:52:42 +0000 |
|---|---|---|
| committer | Tobias Klausmann <klausman@gentoo.org> | 2015-07-04 13:52:42 +0000 |
| commit | 5cb1e0d75b97b24c1c3893f258813620bd5a5c5e (patch) | |
| tree | 0a1ba07c0cc217dbeeb215478f320bc3e8215a47 | |
| parent | Unmask virtual/perl-Unicode-Collate since we now have a corresponding perl-co... (diff) | |
| download | historical-5cb1e0d75b97b24c1c3893f258813620bd5a5c5e.tar.gz historical-5cb1e0d75b97b24c1c3893f258813620bd5a5c5e.tar.bz2 historical-5cb1e0d75b97b24c1c3893f258813620bd5a5c5e.zip | |
Stable on alpha, bug 538798
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xCE5D54E8
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/Manifest | 16 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-2.2.14.ebuild | 4 |
3 files changed, 14 insertions, 11 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 3f438b3e316b..b294169e79db 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.870 2015/06/28 10:20:29 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.871 2015/07/04 13:52:24 klausman Exp $ + + 04 Jul 2015; Tobias Klausmann <klausman@gentoo.org> ffmpeg-2.2.14.ebuild: + Stable on alpha, bug 538798 28 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> ffmpeg-2.6.3.ebuild: x86 stable wrt bug #547462 diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index c238a16e2aab..718ac188b953 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -20,22 +20,22 @@ EBUILD ffmpeg-0.10.16.ebuild 10077 SHA256 78a2ca42d92c398de9d68c8e9198eecf00a6a2 EBUILD ffmpeg-1.0.10.ebuild 9713 SHA256 6d6ae75be2af88b036b9dff32a15ea2ccea74f02404f22c187de5c1cf0bfb400 SHA512 253a4bfba29398cd1fba6ac6e0f8b6fc5416fd9d86116a4f17af36ee7a50aa5767fa917ecf6f300ad01bef8b8bc58e37582cfedfe94820abd093c26a7f405127 WHIRLPOOL aa180cd1b8ee1d5ff373b02cb942c252daaf05fd4f5ad41155014c6752766ac7f3ad98381435b7999596f06249b64f41ad2955bb1856ece1c6cf88fb96c185f7 EBUILD ffmpeg-1.2.12.ebuild 11006 SHA256 13469cba576174cfb78737018e18444f9b5ffb5ff963a6a84a67856aeda995d2 SHA512 4680ce2f34e946fffd588133eacbf341e08fd6954b249a50488a7b262d66ef87fa4e830ada253a9db731557fbcbc65b6f08b974a2b50b41c459918aa4b2a8e21 WHIRLPOOL 7142e4fe36428f6561b42da91471cd5f11c9978b0c27d59746371d746961280c1739b2840cbf9577f3808d8f6d8a80f4d42c29ca197c506b613624a34a6be318 EBUILD ffmpeg-1.2.6-r1.ebuild 11049 SHA256 88d7665d4e89c851182da15a4b4345ff2b037fd26dad1b2e8b18795cc2a5dd02 SHA512 81aa531007bc9d981b32337a25db8b76770a415347b42885e88e6c330c089f2de84cc671783542a8d1c2b4cf59f3a4bf4520a7a0b2ed9c96528a5ea36fc80aeb WHIRLPOOL 830702c5a1f586a7cf655a0e804d4b60375a8bd41048a7dd0b05657459c66f5e2711fc1e6c712e16cdf073a4a5026a74776014e17d61fdf4ded7c22d98b5f0e3 -EBUILD ffmpeg-2.2.14.ebuild 12619 SHA256 bf55e742a2b499c3c3adc76608e3f160637336832b1049e199a8d45fe0ea9142 SHA512 fb81e35120fc054ce5a167cf0e6adc4d05605b56ebc439185702bf43a24dd468fe2c0d0e740d34de4bebad55e10850f31cdd073af0760c22043b0f0ee7dc4e89 WHIRLPOOL 1c49b7fa34e74c7a595c2bdbbf620ccec287e8e41100cd1ffe97173951e84fe84fdf2a70b38b41a6b0205b775059d3e0bc92171c22fa0c9dcc53aa724a6ad66a +EBUILD ffmpeg-2.2.14.ebuild 12620 SHA256 f6df80806222fa93dc67042b418f4b90873d92d3c25b71e00a8b24faeaace3f8 SHA512 01ddbabbcd2193402ebcbc7b3b091da4019461f9bbc96b78e723712f7731a5744e9cd1d88608462e8e4c7b05ad9064534a30e1a3fff8f050f6fa0aa3e3210c8a WHIRLPOOL ee5cf6cee868a58ea5540aedef7d0ca9e671780b0802d6ab2b70eeac9f2a05f4bc5caa541fec5749cd6e7b428ad6022496aef948a3c05417dbd1b23259a04b97 EBUILD ffmpeg-2.2.15.ebuild 12628 SHA256 204b477a335bb17077ab5752a688b800fa32e743a0a19a4cb4ce9d7ac423fc14 SHA512 d102a27975ccb25f8dcd3883ed4aaa4ffae8b8e675778d3686e38942bd6041f114bbcfa23d24f21c691d5c5f317d4f20c75312fa34eff254f68668995c1a2756 WHIRLPOOL b10837556abead054fbd5dfad7db4c3da54a85c34f2bf713ada6ca59ed20998e9670f2769b8fe1b244daf460fc1277ae69e465c11b79c753925706df8ec8801c EBUILD ffmpeg-2.2.16.ebuild 12628 SHA256 77129da0598427e897792f3848903b617ee10b665816aa89ca322e1c87122778 SHA512 ca4b4435f2bcb0eaec217a1ccef6f8dac1c58251248f329d146bd0d06b7b3ae4bb1dfdf434077fd4946e454ac5cdcb3c135d38fb49ef5ebe69bdc2bf493e1a09 WHIRLPOOL 021cbb56f7031024e5f8eb4b5a1545402ebfd671b3d428f64149bc6c02a6abfea5ce26b8ecedd9ded0574296c1c5e039618e236269841a0dffb8f02e925c6ecb EBUILD ffmpeg-2.6.3.ebuild 14572 SHA256 e96f550bdb4f1af4aa10898646a3a2aaadaccf88f055ca8bf262ad07f2d366ea SHA512 b90f7f9c95d18a48b9626668c784c085a0d1b6418e71632cd327a9da2ca67dc9af02000c7f69d54614e860108e50ee8f55d096aa9b05e783df0a80c74fac63cd WHIRLPOOL 58f66c76833f038db5a7249867f5b4bb9afc949a7dd787e50957a3c9619cc6d926f9306a9241d53963a74639c50c2d46f6889b660525326a8ad70061fda02cd0 EBUILD ffmpeg-2.7.1.ebuild 14576 SHA256 bf87d04cf6b6ed30f8875014e586eac1ebe1e53abf61030a56d2413220563bb2 SHA512 48b4e241987f3e0924fb54106f2d412a3d5ca9949bb87e2cd4f007eac912eacdb2fff26edd55b6733142915b6641a9150894da4dbfca48bc3df54eb39f315d75 WHIRLPOOL e3a79c4d1fdde58811f50ad808b888298e73784ec03c3162d864c118ce650ba0feff0932874f8e0e2a8db5396886ba30d74c8b8896f952555c429b4fbfaad6d4 EBUILD ffmpeg-2.7.ebuild 14574 SHA256 bc4f825042dbe4d6ac40e8e41417d2431170b9f27ce00a761f53484ee44c189d SHA512 ecfeb9b86b83a5698819d6fd24306f0c61b966a53dfd3846e13dacad85f43f17b9f5e29e500f65dbb2feba2e8416406d1640675eed20502dfd46961c5a8b5464 WHIRLPOOL b9ccc4d985c01c32abaa9521734a86cd43563db47600b5b457cf50f9920c7f7d1c2616214e8f5de6f1c6df4f050138b4b644da8624282fb3f2efb583bb3c4fb6 EBUILD ffmpeg-9999.ebuild 14656 SHA256 271c49556518967ca466966a4d4f2120e600444278a511cfc098891379e396f1 SHA512 3f6d958f97c85cd4e26a6551b2104cf7b79087570608d5bacfda4ecf5e0c7cbedb72049635ff625f38b06b1ca4a3bd676a940f7b5dd800f608baf54d407ddad1 WHIRLPOOL 815e46ac6851973fe19509b03c72f1eff38018b854d4d705808218bf0376ed032291ef551a8079ca5eeebe815ea3cfc1478be0778d99daa043fe38bbd0e16f47 -MISC ChangeLog 7113 SHA256 ae22d95d0b9cb75d76e770d8212464d0cd10efbad7a6cf5184888adb5a753d7b SHA512 12a917dd6fdcb7548a2cb74b20b8a88a07dbc3fcfc0e5a640e723b65d8d985211d604b12f67426169ef766795282dd4be9826e6e1940326f4b191a059c02c9c2 WHIRLPOOL 14dbbf51872ab2abef2d5182f241debf9a6727ccfd6d58c7a56288b0828638560b8f2fdb7ddbee0c3473c59a309cde9ec453f65e53e92eb4494cb214859bd8da +MISC ChangeLog 7221 SHA256 7e6ecd105aa5410c068407a66df8318927eb80dac6984d277267aece68aaf1ee SHA512 45d28c7ede1c7a817368369112343de928e5895fd7ea842c966748325ce280f7a1d5f0383236fa37ba5ba56590e5ebdbd4a6e98f7c3a2a46e94c413bc1be8fc1 WHIRLPOOL 4dee988244a98293b2fed27f5224790ecfe8c8578b8b962c836ea8b2918ef3e2c65fa8d75ff8bacad9b2636d76dfed20b92f963f932b31e80d50593546f2ef10 MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701 MISC metadata.xml 4441 SHA256 8b2ebd8f0aaec4a187e1bcf7dc270663e61a5edc022fecfbbe96c7c7fedd04c5 SHA512 c6f6beac2a2a722ba0ce490deedc77b53b8467788dd651966caae6d731dd3cd75cc7cb5737eca4fe3f4e14b01e7e69dc28c51f82d0f47bdd5e50d59a43f43eb4 WHIRLPOOL 74ea1a4ac96bb12d69a3aec78018fed91abffdd3055c70b74992e838a8c05af5e062d482e042934827e458f3f3c3b5d29032527a455b974cfcfd13f31cfe4247 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.1 -iJwEAQEIAAYFAlWPyekACgkQG9wOWsQutdZ1dAP/VB0zD0BWY0zOHBVOhXR7vEPs -hN62N2OPe1B3yHkTsD5Lw/ZVxKcOWnB3CpiAdANCyyfZDvOrGoKiWdn3tI22gdqC -9AqcwQLndPkC+I0r3gtpbELzMhraqDyCecVV5eQr75SWr07F0GUvEAgi24184bqJ -2aVV96agGxJnhHbqD1s= -=0GfQ +iKYEAREIAGYFAlWX5RlfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl +bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz +RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOiYFACaAxFW3JGd+ulH4sF+FdB5BinW +hQkAn2spl2iIU6Ii/diOVXllG+VjQJHi +=akBS -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild index 61baa290f677..f582ad04b9bf 100644 --- a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild +++ b/media-video/ffmpeg/ffmpeg-2.2.14.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.14.ebuild,v 1.10 2015/05/30 10:55:14 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.11 2015/07/04 13:52:24 klausman 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="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~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 bluray +bzip2 cdio celt |