summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--virtual/ffmpeg/ChangeLog5
-rw-r--r--virtual/ffmpeg/Manifest22
-rw-r--r--virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild4
3 files changed, 12 insertions, 19 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index d375e5ac3304..847794848301 100644
--- a/virtual/ffmpeg/ChangeLog
+++ b/virtual/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for virtual/ffmpeg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.29 2012/04/20 08:43:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.30 2012/04/21 12:03:36 maekke Exp $
+
+ 21 Apr 2012; Markus Meier <maekke@gentoo.org> ffmpeg-0.10.2-r1.ebuild:
+ arm stable, bug #412123
20 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> -ffmpeg-0.10.2.ebuild:
Delete unused version.
diff --git a/virtual/ffmpeg/Manifest b/virtual/ffmpeg/Manifest
index 5dc8cd6e778c..dbd1c7ccabb5 100644
--- a/virtual/ffmpeg/Manifest
+++ b/virtual/ffmpeg/Manifest
@@ -1,26 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-EBUILD ffmpeg-0.10.2-r1.ebuild 717 RMD160 71647309eb316110c8af4a25791fa8b7f01ba086 SHA1 311af09195d30feaaacf73dcbb81dbf50221f799 SHA256 6aae36a956453410f6a1cbc22295af61e9b3f175f6a2d9195499474d5ff4d1a8
+EBUILD ffmpeg-0.10.2-r1.ebuild 719 RMD160 aaf492333bc93e51c3f9b12f16f6f30f1a44b92a SHA1 d38ad36f33b0b315cbe8867e29c0a41d1fa2143b SHA256 a65aa18cea55f2a65780d38da32fedc107b33c669d5e3c47bbf39c951a2af65f
EBUILD ffmpeg-0.6-r1.ebuild 654 RMD160 8c376598e0b5b75507a130a1837893d1ecf2efd2 SHA1 9a491f53969693edd3c47a3c9377de1362fbe4a1 SHA256 0829565f40df363e2f13de3406d40098332ebd1bb70c49c2d128532a02fdee6c
EBUILD ffmpeg-0.6.90.ebuild 699 RMD160 efe4738ec1285b23a1ba325776c80e09fa743e8d SHA1 28fa2d8fabf3686a488a1f61b50362c4939d92e3 SHA256 fb038e00b5b99ce7da9dfef8c982e6ad97cf80ffe13d63e465561e6dd29dd9ae
EBUILD ffmpeg-0.9.ebuild 695 RMD160 5f7a88d66c3f8ad55f987133784d4f549e5bcc26 SHA1 76494acc0af377aab98c74bf72e8d44988a7c43e SHA256 387dd7e3d58e96ad31cfd514837413621382c7a1eb75d63c7271ab9c0cf87151
-MISC ChangeLog 4790 RMD160 4401f6c165f35bbb04877d7d1bdfc13150632ae6 SHA1 98e6df1447612c30d05344a84b2b8c4872ae493f SHA256 95dfe17b0bf36f587122de52dacd27b9f1ce7c473c3da4f8d7d02b36f4aa3b05
+MISC ChangeLog 4887 RMD160 7d795a9ed8ce6a4edec73080fa913fdcba3e3eb9 SHA1 3fb7e70cf26174efc3459d4abb765f15df2ce9e5 SHA256 d5efb4f48fd73b6cfd0afe64bbea53d933f3589b28408da5c56c546e2e035f13
MISC metadata.xml 444 RMD160 fc60036f4c1ac0da29830090aa021ccc2e9cbe98 SHA1 82f158dc39f1300bf473282a3ce916534f0e44f1 SHA256 cef0fff52fc751969934693172e0c5f23fea1bddb44b0dc0ed68cb7bc00d1770
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iQIbBAEBAgAGBQJPkSG1AAoJEOSiRoyO7jvo0zUP+OX3a5j+CYfE4Fdsrr658teA
-2aXhH/Y4H4KASQx0ecX1Ocxl6+/R1X8q4/Pq7lihE3sopf1t9TCg1+NhOmsZukLI
-DoVcn6PrryCgpFOGolHHUpBX15RtAK7+C8v/qoVdfXX8kkLCYGaYvj59Tb1bBSiq
-be5bDkBeeqz7Cy9ol/RR67qPJupTYNaQc1e232mo/n+wreoqBjueXdTrfKUod/tZ
-a584Loy53mV/0QLIgxybp3oEHtX5x8BdzNiYGW4WLlO6H0b7pBiEX6omLqYp9TRs
-ZKuzh6SXS5VEt92PbYi48VZsfHDSnSJ7PwY4qwlwQcHsvHtk2J/noTrBIiwp6+SV
-7oyoxxI3VyA2PtM4rgbX59S1hLNJOPLjsVa7XQ5OALR1c1roGWJiEBLoqBgiagdi
-JWfZkCgl9+OpupekMXsUTdRfUHk9HXSwHnR1htFSBKerWBRbG+xi30vaxS6ec9Yl
-ybKswxgf/+WXurKxaSjqitjT2ZgHXOx6O3hMiFFxPrnQ3OUQk8skWVajiYtIgLtu
-Efn8zIjQMo5LeE7zYa/6FDGE4uzhBQPRqberlJasmQ5nrXmtnCbD3nYA/SVU/9RI
-/+uWfTJRy5m3sfTQp6KeamlG4qWNRgVMCnedZh3AT6fbD87G/aYFs+TNZzjuaXoI
-6sk/60DwUXArTGZTISg=
-=dxFx
+iEYEARECAAYFAk+SoscACgkQkKaRLQcq0GLbUACfTbo39Vy/8YYviHR7g9aYEOqz
+88AAn3z19VxU0j3aHRnuMkOCsd7CDhve
+=iyJm
-----END PGP SIGNATURE-----
diff --git a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
index d351a4246d59..9d93e2421144 100644
--- a/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
+++ b/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.3 2012/04/19 11:52:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.2-r1.ebuild,v 1.4 2012/04/21 12:03:36 maekke Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="X +encode jpeg2k mp3 sdl theora threads truetype vaapi vdpau x264"
RDEPEND="