summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog6
-rw-r--r--media-video/ffmpeg/Manifest14
-rw-r--r--media-video/ffmpeg/ffmpeg-0.7.5.ebuild4
3 files changed, 9 insertions, 15 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 0949947a7d31..41172665515c 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.457 2011/09/22 14:24:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.458 2011/09/22 20:37:21 chainsaw Exp $
+
+ 22 Sep 2011; Tony Vroon <chainsaw@gentoo.org> ffmpeg-0.7.5.ebuild:
+ Marked stable on based on arch testing by Agostino "ago" Sarubbo in security
+ bug #384095.
*ffmpeg-0.8.4 (22 Sep 2011)
*ffmpeg-0.7.5 (22 Sep 2011)
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 31094ecd9ade..93131d8ac760 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
DIST ffmpeg-0.7.3.tar.bz2 4522604 RMD160 30da423b0a56efb6273a9a59b47a6cfe237278e2 SHA1 8a5e0e6bfffe491775da0d65a614e358038c44b4 SHA256 58ee859d9c4f5c477ea5bd0dd8e6848ce3af8b6c0ffe3b556612d437e85abb17
DIST ffmpeg-0.7.4.tar.bz2 4523220 RMD160 df886310ae02b851c02be531a67b5c140970af96 SHA1 f528ef9eaa224acd970710d6a408f2ff03b39544 SHA256 3ec851e77b656bf16a16c122457c9db2340175b48b2c327e6f00e9e173f09669
DIST ffmpeg-0.7.5.tar.bz2 4526277 RMD160 6e2bcb7b57b7984c05c9c91c94f58ef9730adb72 SHA1 80dd1911c3fe14909fb3b9feeb9c2a0cb26d0aca SHA256 01d2cf6db491c5d2e6da8f9ca2e024d5cf6ac768f73b7a1c6b7fd686825a0556
@@ -9,17 +6,10 @@ DIST ffmpeg-0.8.3.tar.bz2 4511737 RMD160 0550100988a579bd977b369fdd7cc472d41b420
DIST ffmpeg-0.8.4.tar.bz2 4519099 RMD160 7ceaf8595b67564ff92529ff375b2457d6b6fa80 SHA1 70fc95f2711defe4953862bd42a5a228cee803b8 SHA256 c313c6645526f5a1af6f4bab0e401acfd1f908966858fdb7931ee4fd2cc54be7
EBUILD ffmpeg-0.7.3.ebuild 8288 RMD160 a8b52320bcdee95139496431f75ea9a05c480332 SHA1 e5e302359ca0f8a729ec6dc1c150bd9493a1381d SHA256 5090e36c3e59d2b073dbb6d84f963288047b029a914877200a2aeb1bf8d9b0b7
EBUILD ffmpeg-0.7.4.ebuild 8290 RMD160 2cfe460ca592d3b250ff20184c17f65f2daf96a1 SHA1 43bbef54bf2a34815a0456e89a7ed96e834fd464 SHA256 72ced592c85085c444ed3611f5c9de3fe920c970db01150d8fb35d3102520e97
-EBUILD ffmpeg-0.7.5.ebuild 8298 RMD160 02c03b390b5514ca12ac52be95434d011e9e82b3 SHA1 2827c490818abc329afeb182cdf4b1feeef47390 SHA256 7a6a40e7a4470d57690f7abd435cacf8d0b28ad555cf8fc90fc1d89b0307f873
+EBUILD ffmpeg-0.7.5.ebuild 8297 RMD160 53a20381219bee41f6033d0716fb95a48ebdcf3c SHA1 b985d31e30a5c98f788936df93ed265e61f9bb9d SHA256 a47a140d7e77b24cced3f0e7f99994fec397d326bdc791881d00679b9da9a589
EBUILD ffmpeg-0.8.2.ebuild 7830 RMD160 e4656d6311619f2f4fd09678df155a767facdef3 SHA1 5732d598d380e0fb9e22086fca403ba7479258fd SHA256 317a10414a0e56a62c358484c994cd4974574fc8e50c785d0c0de1e29ef951d7
EBUILD ffmpeg-0.8.3.ebuild 7830 RMD160 47884592486b9b815d0df95dad8ea4e26ff3f1c3 SHA1 4f4821b15f620c89ca4849a15655783afd75118b SHA256 286d0cb270395742dd9b408ad423ef54333bbd5b16276720ae7187971960c392
EBUILD ffmpeg-0.8.4.ebuild 7830 RMD160 d5cd97a30fc588caca4ba3824a8109bd3a298d16 SHA1 8aea46ed3ce0dd70fac1c8a4553ba0791b74e270 SHA256 c4873bf468b1777c0c6c67ec2202f4ae429ceba246cd3edcc0f17b395844e322
EBUILD ffmpeg-9999.ebuild 8025 RMD160 d011411425e34a268a8361f8bbff67e9679e031b SHA1 fb3fb3a770f571d6598b751b996ae868fc9e73fb SHA256 896da35882f117e1926bc347dd0256ee5a029fc3578440efab5b80f7a7df047d
-MISC ChangeLog 66688 RMD160 174d6f9a117dbaddf4ab96acbd72756877f6d8af SHA1 b9666ed771501654c89a722263de276c98246acc SHA256 ca95c3ef23631a2e4015d63a0d492719e0d722360a2c81bd002601475c6d2fe7
+MISC ChangeLog 66852 RMD160 61dc0b090938d0a51f4a4b805e6e5f04818d72d5 SHA1 08cdf2f2fdd297b05c62261c4353a60107e26076 SHA256 05f5904e7960dd19916c222df8e864829a534ece9ced3777bcea61acff1950b0
MISC metadata.xml 2646 RMD160 53e3a45f432bde3b3a8719b423344974b8eb83dd SHA1 fe660027a1984dbabd737f7ae2b4b8114118eded SHA256 1f7636fccd557eff9ff6e820639081b2a53beb3b71b73c392708c2e6d18027cf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk57RS8ACgkQvFcC4BYPU0q+DQCeJqYfOPC702gwv3nVxBgTSlKA
-v2cAn1+EMAAIKAopEN5DR7Rpf3pSQeUW
-=HpM2
------END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.7.5.ebuild b/media-video/ffmpeg/ffmpeg-0.7.5.ebuild
index 9275bc3f253a..d7964e7aa882 100644
--- a/media-video/ffmpeg/ffmpeg-0.7.5.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.7.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.5.ebuild,v 1.1 2011/09/22 14:24:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7.5.ebuild,v 1.2 2011/09/22 20:37:21 chainsaw Exp $
EAPI="2"
@@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}"
LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
SLOT="0"
if [ "${PV#9999}" = "${PV}" ] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
IUSE="
+3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection