summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klausmann <klausman@gentoo.org>2015-07-16 11:32:26 +0000
committerTobias Klausmann <klausman@gentoo.org>2015-07-16 11:32:26 +0000
commit99d63657265e10cadd3a2afba12c57a641f1cae9 (patch)
treea09903df9211798fe53278d35b597f7a11b7372b /media-video
parentbump to texlive 2015 (diff)
downloadhistorical-99d63657265e10cadd3a2afba12c57a641f1cae9.tar.gz
historical-99d63657265e10cadd3a2afba12c57a641f1cae9.tar.bz2
historical-99d63657265e10cadd3a2afba12c57a641f1cae9.zip
Stable on alpha, bug 547462
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xCE5D54E8
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/Manifest14
-rw-r--r--media-video/ffmpeg/ffmpeg-2.6.3.ebuild4
3 files changed, 14 insertions, 9 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 005bfaaedf88..a65bee8ea379 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.872 2015/07/13 09:43:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.873 2015/07/16 11:31:36 klausman Exp $
+
+ 16 Jul 2015; Tobias Klausmann <klausman@gentoo.org> ffmpeg-2.6.3.ebuild:
+ Stable on alpha, bug 547462
13 Jul 2015; Alexis Ballier <aballier@gentoo.org> -ffmpeg-1.2.6-r1.ebuild,
-ffmpeg-2.2.15.ebuild, -ffmpeg-2.7.ebuild, -files/dirac_arith_hardened.patch:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index d1f08b1d4f25..244abd2f04f7 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -17,16 +17,18 @@ EBUILD ffmpeg-1.0.10.ebuild 9713 SHA256 6d6ae75be2af88b036b9dff32a15ea2ccea74f02
EBUILD ffmpeg-1.2.12.ebuild 11006 SHA256 13469cba576174cfb78737018e18444f9b5ffb5ff963a6a84a67856aeda995d2 SHA512 4680ce2f34e946fffd588133eacbf341e08fd6954b249a50488a7b262d66ef87fa4e830ada253a9db731557fbcbc65b6f08b974a2b50b41c459918aa4b2a8e21 WHIRLPOOL 7142e4fe36428f6561b42da91471cd5f11c9978b0c27d59746371d746961280c1739b2840cbf9577f3808d8f6d8a80f4d42c29ca197c506b613624a34a6be318
EBUILD ffmpeg-2.2.14.ebuild 12620 SHA256 f6df80806222fa93dc67042b418f4b90873d92d3c25b71e00a8b24faeaace3f8 SHA512 01ddbabbcd2193402ebcbc7b3b091da4019461f9bbc96b78e723712f7731a5744e9cd1d88608462e8e4c7b05ad9064534a30e1a3fff8f050f6fa0aa3e3210c8a WHIRLPOOL ee5cf6cee868a58ea5540aedef7d0ca9e671780b0802d6ab2b70eeac9f2a05f4bc5caa541fec5749cd6e7b428ad6022496aef948a3c05417dbd1b23259a04b97
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.6.3.ebuild 14572 SHA256 d6304b307fb559ef8e438af07510f08842039b6f45c3e28f42116fa70b2ab659 SHA512 0a474f96ae0b97368a558d84e50b29f18ef00e3a4615d5657a094a5970283bbc8f0eddafb46d9eeca267f2c643aa713b776b80bc32e70bb82a04a822afdb51a5 WHIRLPOOL acfb771e54c545b83d2fd53d31471ef51160fac48c366a5da4647d2f7f8e17bebc08d90df3ca9decceaa526d69bf30b354d6422b0c35deb8596ba984f29e0ae9
EBUILD ffmpeg-2.7.1.ebuild 14576 SHA256 bf87d04cf6b6ed30f8875014e586eac1ebe1e53abf61030a56d2413220563bb2 SHA512 48b4e241987f3e0924fb54106f2d412a3d5ca9949bb87e2cd4f007eac912eacdb2fff26edd55b6733142915b6641a9150894da4dbfca48bc3df54eb39f315d75 WHIRLPOOL e3a79c4d1fdde58811f50ad808b888298e73784ec03c3162d864c118ce650ba0feff0932874f8e0e2a8db5396886ba30d74c8b8896f952555c429b4fbfaad6d4
EBUILD ffmpeg-9999.ebuild 14656 SHA256 271c49556518967ca466966a4d4f2120e600444278a511cfc098891379e396f1 SHA512 3f6d958f97c85cd4e26a6551b2104cf7b79087570608d5bacfda4ecf5e0c7cbedb72049635ff625f38b06b1ca4a3bd676a940f7b5dd800f608baf54d407ddad1 WHIRLPOOL 815e46ac6851973fe19509b03c72f1eff38018b854d4d705808218bf0376ed032291ef551a8079ca5eeebe815ea3cfc1478be0778d99daa043fe38bbd0e16f47
-MISC ChangeLog 7392 SHA256 be6e39f9cbcaf6633bf48982eb29d5a5fb440171cd8e92908ee5e649bba0bd1e SHA512 6f3b897a5229f771b2c6abf0dd938d9ada5f501270ec87781046f705650c7e3dd571b1bc06011c1a92999e3c0eb750711d834af577fc5e358f0b0ba29ab912a7 WHIRLPOOL 89de2b8060d70815cb311caacc395c2c43faaa48b66e90762b2cfbe2c9d8b6ce021b9b2450c4df7a60218fba669b1645688d63bb579e1f700eadc27569340c68
+MISC ChangeLog 7498 SHA256 e7588d2f5f297086c55c59d04135d8749e917d0f89384e9973d11cd4362e74f2 SHA512 00cfd23912262a1e8de5fa8937d1fe38503f160260d01ab0c6aac347a8e3bf7bc458292b8296672ce74a89795768eb6d4ce0f9939e2e40145c1945d80857a511 WHIRLPOOL 8e2491e61971245d470437ff28262f29bd48e5d4c83ecf083b8e26b717b5836266cc70b196d765187f54645eff666ca6304d0412295989edada5163cfd1e2fc2
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
-iEYEAREIAAYFAlWjiC4ACgkQvFcC4BYPU0qXswCfS4edWxN2AkUTocgUszzDIyjd
-RQIAoLB19r/bPvVXEyTOtx5+tlPCVX4v
-=VDqq
+iKYEAREIAGYFAlWnlhlfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
+RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOgd5QCfYUeZWORJmRM6nXUyMpqUpbNY
+Gm0AnjMdlRClluHVQpewVvXM+n5Aciki
+=YYv3
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
index d4ac465135e0..b4fb4b2b7ec9 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.3.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.6.3.ebuild,v 1.5 2015/06/28 10:20:29 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v 1.6 2015/07/16 11:31:36 klausman Exp $
EAPI="5"
@@ -55,7 +55,7 @@ LICENSE="
samba? ( GPL-3 )
"
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
# Options to use as use_enable in the foo[:bar] form.