summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <fauli@gentoo.org>2010-12-09 08:31:54 +0000
committerChristian Faulhammer <fauli@gentoo.org>2010-12-09 08:31:54 +0000
commit8fe72fa324ded935ac03a762ce363fbe933147ec (patch)
treeac68078e0499d365e9d43bb696ac6a5f3faa7e6a /media-video
parentstable x86, security bug 347625 (diff)
downloadhistorical-8fe72fa324ded935ac03a762ce363fbe933147ec.tar.gz
historical-8fe72fa324ded935ac03a762ce363fbe933147ec.tar.bz2
historical-8fe72fa324ded935ac03a762ce363fbe933147ec.zip
stable x86, security bug 347625
Package-Manager: portage-2.1.9.24/cvs/Linux i686
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.6_p25767.ebuild4
3 files changed, 19 insertions, 5 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index e0efddf8c2b5..f5124a293515 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.388 2010/11/26 16:30:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.389 2010/12/09 08:31:54 fauli Exp $
+
+ 09 Dec 2010; Christian Faulhammer <fauli@gentoo.org>
+ ffmpeg-0.6_p25767.ebuild:
+ stable x86, security bug 347625
26 Nov 2010; Jeroen Roovers <jer@gentoo.org> ffmpeg-0.6_p25423.ebuild,
ffmpeg-0.6_p25767.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index b6354e39eb39..cd75e7039daa 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST ffmpeg-0.5_p20373.tar.bz2 3087600 RMD160 6a960e0837f419c882c7bd18c91f582df0e19c58 SHA1 ddf5d0389586d8ceb2979e0804a7b80a9640aad4 SHA256 2a217144c82f11c80f325c653157bd9fc5424dc43a2b2ccbc8eb03a01d33418d
DIST ffmpeg-0.5_p22846.tar.bz2 3675057 RMD160 3ebd997321d59fa0baf87329518e925ccbed3cf8 SHA1 d207570ed009b63c94485ccc64439107cf700f39 SHA256 a52d82476afa7c8ed62c1a52760e49907947c1ef1ecfc3e9022fa713e9783f2f
DIST ffmpeg-0.6.tar.bz2 3720372 RMD160 1ff6a8f419239a03d84f67cc954f60f73632432a SHA1 c130e3bc368251b9130ce6eafb44fe8c3993ff5c SHA256 6730baa6750f0cbffaf5f4c04f8ddcf1ebe6c651a6eeb12ae947a228de4c8120
@@ -7,7 +10,14 @@ EBUILD ffmpeg-0.5_p20373.ebuild 7761 RMD160 872bb18a1eabab4c81cea1d4cf4f1283b14f
EBUILD ffmpeg-0.5_p22846.ebuild 7608 RMD160 d4a4c505829c6fd6c93e1e6ec465028a0997989e SHA1 46e7764045594b636d0eb6179f464e3f378b4895 SHA256 227cbee58e559eab07d0d97dbccbd2212b56be6c60cc7a57436894ac3b10e63d
EBUILD ffmpeg-0.6.ebuild 7782 RMD160 4e86665574a92183ad00554fbe92a092e450cc7a SHA1 093701855aeddd6b9fdcfd4d4cdf0abb9032e058 SHA256 54a4e2bbd1e132c9b75516ba42db83b6b4cb206c48ac37554fb0c660016047f9
EBUILD ffmpeg-0.6_p25423.ebuild 7945 RMD160 c80b8dfa151691ecf78ed3f8cf8ccd9657547db5 SHA1 004b529c97a8cd55557098dcf3852ccfe6aa71ea SHA256 797989b86f72bfd0320ea4efa1b6a3f8521630b59fd74ebd8c423a6b5d900a51
-EBUILD ffmpeg-0.6_p25767.ebuild 7945 RMD160 ab56cb291971e52ae2a7bda8299905f8002d3302 SHA1 1d5226f970a2be7293b7336a90e4d1307f9c36c4 SHA256 7dc6adb0e27e6cdc59b6d24e0600ece651a76e27d86080a01bf3a71449989b48
+EBUILD ffmpeg-0.6_p25767.ebuild 7946 RMD160 3c63991fb044be3370883cff3a33fbec0c180c1d SHA1 77411bb3ba5e2a6e2725b91dbdc031ae6f00ff1f SHA256 530dca5c04a6c4d12cab14e7933d2ec3db6ed0d0694ba1d7c73bdcbb7797aabf
EBUILD ffmpeg-9999.ebuild 7945 RMD160 37a9e7ac611fd749b88aa1008326fbb7d0788c33 SHA1 9070af9175a70098238c757421eb3290fa24b883 SHA256 33459eb0e4c81caec67344cbb77b4effc973c16c61c21915e4f338835099382e
-MISC ChangeLog 57588 RMD160 0d00be0d6b6375610d6ea8f9584528836f4ef635 SHA1 93bb9fcb316638b8dad2abd1505ba64519825192 SHA256 102914b0a695cef1d41ba4be6d3f0dadad6a5c366192bfe1ca221631a69fda2e
+MISC ChangeLog 57708 RMD160 d167e868d33a884d2eb5e85472a5a8f6425dad46 SHA1 37a33857105a88c5646b0cf3fbc72ebb705989f5 SHA256 003fbe2520e1825ecbdd996d64a57db51c59420b72b478074ba1244255739d5b
MISC metadata.xml 2265 RMD160 0416ebff8851e2ec715a801a3ecd66a98865578e SHA1 58d9750865481aedecd4d61dcaee9e43e6a27404 SHA256 38a520565c24ca97877c3b2814d685beb0079e3ad4d28e5924667084ba3ffd86
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0AlHgACgkQNQqtfCuFnePk5gCeMrdjjupvNvYdFcOZk34UfeKR
+dcQAnja0pgjjmGhuY9oEfPZZnlfE52ZK
+=n1zq
+-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild b/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild
index 6b6cabaa8aec..ebbf5722c57e 100644
--- a/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild,v 1.2 2010/11/26 16:30:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.6_p25767.ebuild,v 1.3 2010/12/09 08:31:54 fauli Exp $
EAPI="2"
@@ -26,7 +26,7 @@ FFMPEG_REVISION="${PV#*_p}"
LICENSE="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 alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"