summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klausmann <klausman@gentoo.org>2011-06-21 13:59:29 +0000
committerTobias Klausmann <klausman@gentoo.org>2011-06-21 13:59:29 +0000
commit3f4b2a08422b5d44216df62553d976833974ebc9 (patch)
tree8fc0c1890a5fed9b871da2cc034c20bcbf937ae4 /media-video
parentversion bump (diff)
downloadhistorical-3f4b2a08422b5d44216df62553d976833974ebc9.tar.gz
historical-3f4b2a08422b5d44216df62553d976833974ebc9.tar.bz2
historical-3f4b2a08422b5d44216df62553d976833974ebc9.zip
Stable on alpha, bug #365273
Package-Manager: portage-2.1.10.3/cvs/Linux x86_64
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-0.7_rc1.ebuild4
3 files changed, 11 insertions, 8 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index e2adc59536c2..e3a3e290d443 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# 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.415 2011/06/16 22:57:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.416 2011/06/21 13:59:29 klausman Exp $
+
+ 21 Jun 2011; Tobias Klausmann <klausman@gentoo.org> ffmpeg-0.7_rc1.ebuild:
+ Stable on alpha, bug #365273
16 Jun 2011; Jeroen Roovers <jer@gentoo.org> ffmpeg-0.7_rc1.ebuild:
Stable for HPPA (bug #365273).
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index e889ac57948f..112d962791ce 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -10,14 +10,14 @@ DIST ffmpeg-0.7-rc1.tar.bz2 4782516 RMD160 26bad1c174e7b58a3bc207c6327d052670b53
EBUILD ffmpeg-0.6.90_rc0-r2.ebuild 7945 RMD160 2e6f2473b90d3e74ce733797908172618cdc66d0 SHA1 b5101ab094a4d28a73f6997eaf5adc78aa0075b5 SHA256 8f3c607568ec7a3525f176460e645abf6989647a8783091bff3da4a1d07e7af5
EBUILD ffmpeg-0.6.ebuild 7782 RMD160 7dcb53dfd7bed74aa95a6813cad6c55f9fc7f062 SHA1 92d32ee520b6125b1e825bb98f3731cdfb9918c8 SHA256 ba710a4af02900b36fc1ef8d4a60bfb9a216040b3974a2394c1e8e7cec5ef52c
EBUILD ffmpeg-0.6_p25767.ebuild 7911 RMD160 d573b7275c7d72baf655b3ceadf136d43d2fd5ee SHA1 5e6a9b938d283187120148095ff8621d4bd82ad7 SHA256 387073c421106fa9a2f14e71cdba1524d87eebe5b1fb4ef505908dafb0cd0bf8
-EBUILD ffmpeg-0.7_rc1.ebuild 8222 RMD160 d1e27f5d241e129afbae87e0c7bdd9b6fd2973db SHA1 62281c320aaddf297c4ca7a0b42f90415e9a9937 SHA256 36cfff9314c7c11350ac88ea8b828b0aed9f09c4ec6be92fb86fd0b195f73510
+EBUILD ffmpeg-0.7_rc1.ebuild 8226 RMD160 9f4e6e1bfb78c765e3a95f8037aba5cf741f8f59 SHA1 fc43f72781ebc2e373071ee98d1b6414ec5608c1 SHA256 2d11dc31a224250c07b87ee94e4603d581972611ad55c3dc37ddfdfa8f365fdd
EBUILD ffmpeg-9999.ebuild 8238 RMD160 26123a557860016d70d1c40195648dbed26dd292 SHA1 c246860cb2f6f61e1a55c0c9e7f64ac465a81fe6 SHA256 ba0908e6b40886a37d8dc34b1877921b2ba245fa8f467f92e3a2b0525ba094d6
-MISC ChangeLog 61264 RMD160 f8e9f9f60dab84e4ab07bc7e0b33ce86ad4e371f SHA1 c2f4f2285acc7c2af8fd139e811565f598c69d4a SHA256 322f52f4cdda7ea3e9285f658d615c7813896df6471e2fdc8429b1cd0de13b20
+MISC ChangeLog 61378 RMD160 25267a711ed3ae5b5ec5d078ce53efa9f58a6b31 SHA1 0a3d182e5ca71d02f5450eea1ebf2afc8b55a9e5 SHA256 06e41d24e2ed3d88f197d1ef9eb8f5716196326d03d97aa1b2b72c7ba9daf915
MISC metadata.xml 2502 RMD160 7bae5e66cd6f15e3698d0a3cf08b5a3f653b4a25 SHA1 9d036b3eabb7a94a70a54d4c23d7efe0949817ff SHA256 fc5f64eea8d69b93f35e7c8a402d6322c46409e8cc5579a4b96f0fa50ea728ba
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk36imUACgkQVWmRsqeSphOengCeM/ICZRz3I585gPOJlMQ8zcRQ
-iUAAnA7OAyQiYAdncpt7tB4yMtY7YnK6
-=lSBi
+iEYEARECAAYFAk4Ao8YACgkQA+4Doc5dVOh4LwCfTG7KtTwbGZM+8/H42UMumLR4
+zE0AoIauzAi4InD3kBWXQ2Zh73wAGFd7
+=ugwF
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild b/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild
index 9e0910aee379..4e7e8e1da7fc 100644
--- a/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.7_rc1.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_rc1.ebuild,v 1.5 2011/06/16 22:57:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild,v 1.6 2011/06/21 13:59:29 klausman 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 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="alpha ~amd64 ~arm hppa ~ia64 ~sparc ~x86 ~x86-fbsd"
fi
IUSE="
+3dnow +3dnowext aac alsa altivec amr avx bindist +bzip2 celt cpudetection