summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2015-05-30 10:55:17 +0000
committerMarkus Meier <maekke@gentoo.org>2015-05-30 10:55:17 +0000
commit101421f14e4ca350dc09b6a4147da2a3fb7b6c90 (patch)
treee8593f6d6960e9ae8d8e532fc1e1159f4fce6d03 /media-video
parentarm stable, bug #538798 (diff)
downloadhistorical-101421f14e4ca350dc09b6a4147da2a3fb7b6c90.tar.gz
historical-101421f14e4ca350dc09b6a4147da2a3fb7b6c90.tar.bz2
historical-101421f14e4ca350dc09b6a4147da2a3fb7b6c90.zip
arm stable, bug #538798
Package-Manager: portage-2.2.19/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/Manifest20
-rw-r--r--media-video/ffmpeg/ffmpeg-2.2.14.ebuild4
3 files changed, 11 insertions, 18 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 3d5ecb651c2c..1d87543b057b 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.862 2015/05/30 00:03:19 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.863 2015/05/30 10:55:14 maekke Exp $
+
+ 30 May 2015; Markus Meier <maekke@gentoo.org> ffmpeg-2.2.14.ebuild:
+ arm stable, bug #538798
30 May 2015; Jack Morgan <jmorgan@gentoo.org> ffmpeg-2.2.14.ebuild:
ia64 stable wrt bug #538798
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 535a077a9f10..21563a62358a 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -17,27 +17,17 @@ 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 12620 SHA256 02e2aec67643798cf21153edb15b39c71fc1809bfc42a8fbf18cbeddd930f144 SHA512 94408a874c64b9dbb08514d35fc8d3267b775a48c543c328bc9cd5d736c7a7dd687003683e21046f84120159cecb077bcfdc1c9b8980a7bb18909ba59ff6cf92 WHIRLPOOL 30eee896a0feefba94fd331086cba8e5886ef7d964dc7aff365a74468538a5136f3b88befb357f1283ac1e92ebb433881520db515a48e57a083a07cd1cb2928b
+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 14576 SHA256 13e6e59b99eb8a621cffa371eed747c9b8e9e100fa23e163bde911e325d50c06 SHA512 01dcf090403c586a7b72b7711241ecc5cbe22bf4e5513f8491e42e9c8fdce419352baa435dc3d810cb27ffc09999244283d01cf93c5276446bc66fbe448db6a7 WHIRLPOOL 1cb0143dadf7be8c760dbebf34eff8855cf17bf0afbe33579cfbd7bdfb2f6da5dc953f6b9de954160e00963399ec5c4d45cfe31d4e7c8a52d073f9d4f6590272
EBUILD ffmpeg-9999.ebuild 14577 SHA256 098f11afd7a5288ffaba31ecaa28ff95cd932bb04e73185a097a4ea3e96b0762 SHA512 9b4aaf44568cfd5a9b089f3278b6f0071b47c6dc22f15f6d508fa2455d3381596e11dc902f7ec0c5ccd03b6b6b6d473dce27fb3bc202a1af635a8fd409c415a7 WHIRLPOOL d5e75d333cdc00671c6e0d7b62c575421a18c9fb3376f20491caefc1bb59626076da7a417717d5308e1739299207f9358e1157fa5070653fef073b839c58e4f5
-MISC ChangeLog 6243 SHA256 e54b6f4114667f16dd710175cbb829334c663549fa1a75542aee1ec4da4f7f93 SHA512 0380244621f39a968b6e54dd30f4e2f170039a8b23092120f1433e55e49238682b03a1046cfdf2f4bd7bcd809d131972b46ef8e678607f48c2462facab0b2944 WHIRLPOOL c22694ef4ad6505c99123cc81e7e1105ef96592b524ebd50c939913ccc660b0eccac209ad1f64f99dcb224dd8a8f1ce3ad935758002f164ef6800955c2af2ac9
+MISC ChangeLog 6339 SHA256 bfe769955f60a273d45ce94a0eb6123aa960a575be50e6a1935c60421c105794 SHA512 729e4d0ebf971cb8fb13713a6982810cc5fff54a20ff80c088278b144e86a11efaa72c9db6ffcb33d3a34ac5794fdc6233aa9f4ef89776a9a6a64d9616fb5a71 WHIRLPOOL f18bf1cb2869437c2fa6bfbad963b95aa1e39687a9428949b5da3c3c9c7f8e21e77bf80f2510021f742b4adf4e7755e88ccc392a9094e406d0dbad01e0a2a774
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
-iQIcBAEBCAAGBQJVaP5JAAoJENNAYYQy1of1+hwP/Apmgw5NJSKpIw/gzCLBMQF9
-F6h+ZFo5+Nj2DsdTUBqvpWDnyOBYiCQpi/+wl3aMJMLKokRJyt1opZF7DaRLB6OG
-VLZhEHthdiaDPBHzYDgn4/V68B3ju2ftOIfRtJtM/ZIiMqbv83gxo1jTJOlCYkki
-PhgiatPrlHdwaSnK2vscs7mi18EdyPKWaOC6qsJ15Yc5lpfxABZcyFTPrn2HZ3mA
-AQ/XWWD7REhJRT9Pn9m20vALUc7MuwOv+Rkf1Sv0z8hKK4MtozXrrNO2/UGaNClJ
-tcDFFLgoQAKwvW+n5pUpmG8jQmH3cLLOsa1JCoHWtNQuoNG7VLimcv2/oN8yMPjt
-JHlOezkm2Jkxaw0v/Wj/l7ofY25m3Nha727Vpw1m3pD6xA5TM2OVhhAMyhwuqWPL
-1zwL1KO9uC4l+rv6IVca7A2eJE9eoNv873lyNyO2fzbL4rVjWtluuK0TtRWLvzBx
-Gi51Z7wPXeUcKpr1hvoUssZnab8bpnw7zLaM1O/mpUDAdguWCgSBgVpLvDWYzvuF
-Zqs4ISy8NGHkXQ7fMw9RzJ7DbRRL/UKtKhZNl4Jq+4G1uYfhL9mUrJTxsxbcomUH
-oe3RGimlRzFeB4r5qr/GR6PaHG8QbVDIH2Jo9dET/1jyFvKZgb3Bc7sliHHIZF8a
-6WKR1CvT91FnvbtOprbJ
-=Bdmd
+iEYEAREIAAYFAlVplxMACgkQkKaRLQcq0GIzAgCgl73CnuzNhWnirh43DnN09NVf
+WjsAoI0WcjGQ6Xt4GmndmEYYK6lE0pok
+=9kFY
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-2.2.14.ebuild b/media-video/ffmpeg/ffmpeg-2.2.14.ebuild
index ef321b9b8176..61baa290f677 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.9 2015/05/30 00:03:19 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.2.14.ebuild,v 1.10 2015/05/30 10:55:14 maekke 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