summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2015-06-14 19:42:26 +0000
committerMarkus Meier <maekke@gentoo.org>2015-06-14 19:42:26 +0000
commit28d594d8a3c03ed60721be43a8a5a65f65c0ddda (patch)
tree4f337cdf1dd389c6e4b3679d2c4fbec63f7c970b /media-video
parentarm stable, bug #547534 (diff)
downloadhistorical-28d594d8a3c03ed60721be43a8a5a65f65c0ddda.tar.gz
historical-28d594d8a3c03ed60721be43a8a5a65f65c0ddda.tar.bz2
historical-28d594d8a3c03ed60721be43a8a5a65f65c0ddda.zip
arm stable, bug #547462
Package-Manager: portage-2.2.20/cvs/Linux x86_64 RepoMan-Options: --include-arches="arm" Manifest-Sign-Key: 0x072AD062
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/Manifest10
-rw-r--r--media-video/ffmpeg/ffmpeg-2.6.3.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 3e3697ee6205..f6568c4eac7e 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.865 2015/06/10 08:04:05 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.866 2015/06/14 19:42:22 maekke Exp $
+
+ 14 Jun 2015; Markus Meier <maekke@gentoo.org> ffmpeg-2.6.3.ebuild:
+ arm stable, bug #547462
*ffmpeg-2.7 (10 Jun 2015)
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 8033428952a2..cb640f949ae4 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -20,16 +20,16 @@ EBUILD ffmpeg-1.2.12.ebuild 11006 SHA256 13469cba576174cfb78737018e18444f9b5ffb5
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.15.ebuild 12628 SHA256 204b477a335bb17077ab5752a688b800fa32e743a0a19a4cb4ce9d7ac423fc14 SHA512 d102a27975ccb25f8dcd3883ed4aaa4ffae8b8e675778d3686e38942bd6041f114bbcfa23d24f21c691d5c5f317d4f20c75312fa34eff254f68668995c1a2756 WHIRLPOOL b10837556abead054fbd5dfad7db4c3da54a85c34f2bf713ada6ca59ed20998e9670f2769b8fe1b244daf460fc1277ae69e465c11b79c753925706df8ec8801c
-EBUILD ffmpeg-2.6.3.ebuild 14572 SHA256 c6dc48a7660cba547ba863a43a3862714a10cb317472bf2afdfcc6103e2cab34 SHA512 a06898c04700ba52324b722ccf08d35f3c0dafce089cc682decf5037155a58d1a8fa13d5e500f1df03b23bc7a88c7adeb2bdd168ad959701a16024ba0861e2a3 WHIRLPOOL e7a4f60c62dc1b3af475a52918e1c3a90693a53283b478d9d7f8bcdcd79f9a5dec5006cf570879b57955eebd0037347c2ea3d48bd73840d59fbdca1aa4a0f998
+EBUILD ffmpeg-2.6.3.ebuild 14572 SHA256 303da00fc96069726e0f5fa0c4d8bceab0c230e494c80d997ec8e52fad5d56d2 SHA512 1b7026d9e0924d1da935d0a28ed6860411443174d922cea88941f92617eb1a0471da391f471c8d6db269f71c52e29e9688e84620cebcc9eac82c72224c4d003e WHIRLPOOL ece481b8a2eb175a0d148db3cbb43a6a5524b48a7d6a7f09aaf5be66af8944b96fda6ec4452b259602d5855e7b44b7163c712990166fddb9b13694ebccd394b5
EBUILD ffmpeg-2.7.ebuild 14574 SHA256 bc4f825042dbe4d6ac40e8e41417d2431170b9f27ce00a761f53484ee44c189d SHA512 ecfeb9b86b83a5698819d6fd24306f0c61b966a53dfd3846e13dacad85f43f17b9f5e29e500f65dbb2feba2e8416406d1640675eed20502dfd46961c5a8b5464 WHIRLPOOL b9ccc4d985c01c32abaa9521734a86cd43563db47600b5b457cf50f9920c7f7d1c2616214e8f5de6f1c6df4f050138b4b644da8624282fb3f2efb583bb3c4fb6
EBUILD ffmpeg-9999.ebuild 14577 SHA256 098f11afd7a5288ffaba31ecaa28ff95cd932bb04e73185a097a4ea3e96b0762 SHA512 9b4aaf44568cfd5a9b089f3278b6f0071b47c6dc22f15f6d508fa2455d3381596e11dc902f7ec0c5ccd03b6b6b6d473dce27fb3bc202a1af635a8fd409c415a7 WHIRLPOOL d5e75d333cdc00671c6e0d7b62c575421a18c9fb3376f20491caefc1bb59626076da7a417717d5308e1739299207f9358e1157fa5070653fef073b839c58e4f5
-MISC ChangeLog 6552 SHA256 89e2d89b1b393bcb0ec9902551dac5517747e1fff57b1a678dee577cdd6f8a3a SHA512 bf89ba210f333cda8ac082606d0c319fecd9c2f9afaf3ced75dc002b7fafc8b7642939938bad660a21caf834d5a422e8482b5b3fb7ff874aeeac295f50f3aef5 WHIRLPOOL 884a3b56ca0f2e7a08764b971b967fefb6d6b20cfac523ff220d204af52c50da041fccbb562628ed402cdf942e0dbf080d3cd807cab85efedf5c7da3178aa05f
+MISC ChangeLog 6646 SHA256 b0963ad730057aab5d2c1520d07c5d71e213c5e9d685a0d7bc465b42b14b1ddc SHA512 0dd2917111f0d86b3355f45708d36741124e96c1548e37d0d697cae798379e3a1f3a83d7626758cdd0548a0595970666c758726c3b0336c8808ebd69362f807e WHIRLPOOL 0ddd038740516dee5ed88e0effe7dcdf7bd14a3dfb3414d4b7404fbfe8cd6c363a2b632972eb7e8239c2515024f30d66e5b81df56e3e04d7821c157b394a6dd6
MISC ChangeLog-2014 113291 SHA256 4c06c33d7ce130dbe891dac8bbed5394756966a4317815651276b5354aa943ca SHA512 1bd9eb77e715e26a406bf58a543987caf24051dec4f7fd928f6d03af41bf4d952dcdda7c6237cb2ffb9517f04adb9f8fcaac91087fcc758c0836c754050c5ae9 WHIRLPOOL 99024abbc682eee208a9086d0a5450a8855b18a6e20e51e0a19403c0669420e8448b1fd20d5d7558c51c1cc661eb6d3d18623b1dfc42cba9c5fed64f7822b701
MISC metadata.xml 4332 SHA256 b39edc51a5c5d68aefb52639412045287dbd670ab5b43a45b13c2c99d085f9a4 SHA512 0744c75f388ae01989b62cc34c49a665fc19dd8b0639c846a16c84a8db06a9cc571c2952df63857dac15bffca6975a0c872ea59c4f490639655f4eddd1b04ccb WHIRLPOOL ce3593918d35986256ee057520e69ebde51e4201e1d20e66f0367d7bf45e5a1a7301b5c7fa02ec327273702e426a2876a81e381c4af78251e729b2982abb41ad
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlV373YACgkQvFcC4BYPU0q5vQCfaOU47e2erctT4UbVGBPx7AIs
-dscAnjXrBCFkw2VPt0SWC7cTMUy8KUfr
-=A45E
+iEYEAREIAAYFAlV92SAACgkQkKaRLQcq0GI4mwCglJTeLTHTc1oknFBkRHb46KOw
+jDQAoJeMo4WZ0sJ+8V7wa2hHXlQ3rLGM
+=EkAl
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
index feb8351a937f..243fad0fca6c 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.3 2015/06/05 16:33:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v 1.4 2015/06/14 19:42:22 maekke 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.