summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-06-05 16:33:54 +0000
committerPacho Ramos <pacho@gentoo.org>2015-06-05 16:33:54 +0000
commit451db35811986ba333818d7a749dd901728b21b2 (patch)
tree34dc0026c5acf83cd9af0d0043b6578bb2222a71 /media-video
parentamd64 stable, bug #549056 (diff)
downloadhistorical-451db35811986ba333818d7a749dd901728b21b2.tar.gz
historical-451db35811986ba333818d7a749dd901728b21b2.tar.bz2
historical-451db35811986ba333818d7a749dd901728b21b2.zip
amd64 stable, bug #547462
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
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 1d87543b057b..05d3930da901 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.863 2015/05/30 10:55:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.864 2015/06/05 16:33:53 pacho Exp $
+
+ 05 Jun 2015; Pacho Ramos <pacho@gentoo.org> ffmpeg-2.6.3.ebuild:
+ amd64 stable, bug #547462
30 May 2015; Markus Meier <maekke@gentoo.org> ffmpeg-2.2.14.ebuild:
arm stable, bug #538798
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 21563a62358a..9a821441942f 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -19,15 +19,15 @@ 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 14576 SHA256 13e6e59b99eb8a621cffa371eed747c9b8e9e100fa23e163bde911e325d50c06 SHA512 01dcf090403c586a7b72b7711241ecc5cbe22bf4e5513f8491e42e9c8fdce419352baa435dc3d810cb27ffc09999244283d01cf93c5276446bc66fbe448db6a7 WHIRLPOOL 1cb0143dadf7be8c760dbebf34eff8855cf17bf0afbe33579cfbd7bdfb2f6da5dc953f6b9de954160e00963399ec5c4d45cfe31d4e7c8a52d073f9d4f6590272
+EBUILD ffmpeg-2.6.3.ebuild 14572 SHA256 c6dc48a7660cba547ba863a43a3862714a10cb317472bf2afdfcc6103e2cab34 SHA512 a06898c04700ba52324b722ccf08d35f3c0dafce089cc682decf5037155a58d1a8fa13d5e500f1df03b23bc7a88c7adeb2bdd168ad959701a16024ba0861e2a3 WHIRLPOOL e7a4f60c62dc1b3af475a52918e1c3a90693a53283b478d9d7f8bcdcd79f9a5dec5006cf570879b57955eebd0037347c2ea3d48bd73840d59fbdca1aa4a0f998
EBUILD ffmpeg-9999.ebuild 14577 SHA256 098f11afd7a5288ffaba31ecaa28ff95cd932bb04e73185a097a4ea3e96b0762 SHA512 9b4aaf44568cfd5a9b089f3278b6f0071b47c6dc22f15f6d508fa2455d3381596e11dc902f7ec0c5ccd03b6b6b6d473dce27fb3bc202a1af635a8fd409c415a7 WHIRLPOOL d5e75d333cdc00671c6e0d7b62c575421a18c9fb3376f20491caefc1bb59626076da7a417717d5308e1739299207f9358e1157fa5070653fef073b839c58e4f5
-MISC ChangeLog 6339 SHA256 bfe769955f60a273d45ce94a0eb6123aa960a575be50e6a1935c60421c105794 SHA512 729e4d0ebf971cb8fb13713a6982810cc5fff54a20ff80c088278b144e86a11efaa72c9db6ffcb33d3a34ac5794fdc6233aa9f4ef89776a9a6a64d9616fb5a71 WHIRLPOOL f18bf1cb2869437c2fa6bfbad963b95aa1e39687a9428949b5da3c3c9c7f8e21e77bf80f2510021f742b4adf4e7755e88ccc392a9094e406d0dbad01e0a2a774
+MISC ChangeLog 6434 SHA256 545ac6fa9fe5169f8b00c8a62ce81b2fe6da1cfe2859c9d38558acce095202dc SHA512 976393811b31480047d9e3e3607073c8b4b28b37049782ad1ef68d8a2669fee6840af35499e0b1a8bf60040ccc9b70f7c023c275ec5c5cad0e57745812da9c20 WHIRLPOOL e3e3ca30d1898fda350c68e0061c2dba49a48d6f9bd85f2c4adf25b835ef878c63238ecc506623c64896d3c36ef90eb14bb19b346065b63220208ec58641068f
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
-iEYEAREIAAYFAlVplxMACgkQkKaRLQcq0GIzAgCgl73CnuzNhWnirh43DnN09NVf
-WjsAoI0WcjGQ6Xt4GmndmEYYK6lE0pok
-=9kFY
+iEYEAREIAAYFAlVxz3IACgkQCaWpQKGI+9RoNgCfZKy0rNEIrWRZ5cGnbjSAs/+v
+OuAAnRc4yQxLLrXjgLeNE58+JOdQyTHR
+=9L9y
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
index db1413a40eb1..feb8351a937f 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.2 2015/05/29 09:45:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v 1.3 2015/06/05 16:33:53 pacho 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.