summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/Manifest10
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild3
3 files changed, 11 insertions, 7 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 482b48db1052..4d9067ffd7d3 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.603 2013/02/13 17:42:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.604 2013/02/18 18:55:08 aballier Exp $
+
+ 18 Feb 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
+ Add epatch_user, by Hristo Venev, bug #448612
13 Feb 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
run tests against built libavresample
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 2563c4a8d7a3..ea1586a5c289 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -11,13 +11,13 @@ EBUILD ffmpeg-0.10.3.ebuild 8635 SHA256 7a93b57018947a7c57d3829c092aac4ee8e3b554
EBUILD ffmpeg-0.10.6.ebuild 8939 SHA256 d9bb2819b636920d559c7db27b2a7c94763528a2768b4b77d405504cbab9c122 SHA512 9aaee9ceda324977310e80303c1702e352942183dc13d2752746999b9d3c95b9651ea68836197284eeb7b98baa5c49ec88647258e1faef290d7464a7b8925b41 WHIRLPOOL 64f8d4de75e78993b9af6a6ed7b28d6a7774a9f7e8c00bf9dcc8a1e9a51df82a26d295d0e6edc375a5ba34d4b5b0dc97c0c57488a5d42d28b4fe44d7b414c059
EBUILD ffmpeg-1.0.4.ebuild 9581 SHA256 ec5ff5228c222f6ba5bd77d1be4c81fc74b704e1fedabee42c4a32acc953cc81 SHA512 085c0518736768b698f08a7af97fa1bd3ca78fc1e5e5d3b2f0fa0391562d2e95cb834e17c49e77cde60a2abe4e1bd7001bcb2ce12e418dc64ede71ce3feeb60f WHIRLPOOL 27a9fcca56ec3976b48471b6e456739025793d0ce42233451a651eec1ad6f4b757d9e3d0515a50de019332d57eb465c67aade8660ba896cc1c078dc19283bcb0
EBUILD ffmpeg-1.1.2.ebuild 9384 SHA256 6e40411ae95c33bc1cf88306a645cdee90a46ea423636d07ee6ce073014f6ae6 SHA512 52c8504380e27ae3b49da82c028e9f8a26d8f3a400c7ff684583eda9a774f701f61b6505481f773c0da6e7d13d6af16ba3101a599a2bbc5766515ab2b3ead75f WHIRLPOOL d9ac1568710464bead60c91a1226a26a69c6663d92194c286c97ebdec78a927545cfb90d2c4ae803fc5df0b710e342ec75b7c5f4facec653a9b5d31b9ccce10c
-EBUILD ffmpeg-9999.ebuild 9404 SHA256 ec822a487df6a18841b881974cce012954b719ffd755322024a55c9b1a28bfb7 SHA512 38d4eb282512044e9c0d9a24035b967779ba4820d35eaa529d576bd110f88e49b30011a84a4ccd8b56a420378cb70767dcef463f6fbce2380931bb86eabef73d WHIRLPOOL 6fb30e090bde86c7253df7e6e465e431e65613b92f60ab01c06205ed0f364da871983243dcaffdb36aed2770e4916f77393884c4e77dd803a6575a480b2a5d8d
-MISC ChangeLog 85257 SHA256 9aa5c4333a6d2c6218f5758de2337f21121a25392025805dde8b6de9f9ba6606 SHA512 c204e79da01c151f98667a2d5d629d3c8dbb6a0b638974877da3b14c5c62734c84726eeb31bdfde38c301453a4130f6d1eb3b1a9b17ba23ccc3edf11d6ad20e6 WHIRLPOOL cf113b93887661370294c0a202c1d193163e0abf2662163c3506e6f35bd1fa4408c9b9be16740778facc72026ba5de2edfe227c48d3cf8bfee8eb5d5f42c8c75
+EBUILD ffmpeg-9999.ebuild 9417 SHA256 91be90a09a49776423f44bf9e0bb160a069eaefc14373f7a276e7cf8d2173447 SHA512 b838ef99f69bc7c0dd642054e5fbffd0a1d10bd90c3859499d2e40b3b6836df81fbbab4ccc7a0724053966e097c042113a0d9a943756952631c2811133ae79dd WHIRLPOOL 296f3f39297a299686ad7c796d286284994936ae0b6274ade1789df1899083ef8c31b241d31445cae6c88783a16236a46f2c631bbe6088d433ae314a89f52cd1
+MISC ChangeLog 85378 SHA256 ceaf854fbee56ca95cd3fd31d86288b0bcb7b825b659f8f1a6de26166194ac8a SHA512 4301c93ae5f6421f6e1ba41a7132587ff7f9a03e7efac057d5ef6fe19fc7201402921a3c8d86cb95da4770390b70554ca60dc09db8a30a9ad73c0392761387d1 WHIRLPOOL 9df52e248d1665fea3daee544a1bead64e3098ab15b7510d36c0e1d224a398991827888d39fe3ab8ecdc850987b85453e3d8500d70764757365eced700da6b95
MISC metadata.xml 3635 SHA256 89039aac2113c4be46c76642a9ce0fc4d5047e74c19acca0e7e4b19bbc5d7ac1 SHA512 8ab0fd00c5b0eddd28e4c817a5cf3baded477fb22dec6fdff6e871442f92b7b68fa29eb80398e3c52cac5cfcc352e1fb848a6f46b19fc70d0822cc98cf6c1c03 WHIRLPOOL aa035a6597579cf2a212c28986aa4afbe52e3afe01617235801b3c842c8d6b1e7fcabda5beaa8971fb327c9bb475dfe189b95857def0573ad5181c8bec451493
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlEb0I4ACgkQvFcC4BYPU0q2ggCgyMabV+A5c8lKIS5eg8DIN9NM
-XRwAn0KAip9IWPeD+g0raP3iW76hYWJw
-=lrj5
+iEYEAREIAAYFAlEieQ4ACgkQvFcC4BYPU0reGACeP6toY87mZCST48BFxy960air
+dHcAnRp6DcbaH8oq0CoUJ7OKdQ8YbmVl
+=olQB
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 9a726a94b773..3373afac5ec1 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.113 2013/02/13 17:42:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.114 2013/02/18 18:55:08 aballier Exp $
EAPI="4"
@@ -127,6 +127,7 @@ src_prepare() {
if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
export revision=git-N-${FFMPEG_REVISION}
fi
+ epatch_user
}
src_configure() {