summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2011-06-15 16:48:57 +0000
committerJeroen Roovers <jer@gentoo.org>2011-06-15 16:48:57 +0000
commit276fb334fec824fc70fcd072f87d73305ba8d1e6 (patch)
tree5da4cc306703842d3c4f22c91aead124a1220b1f /media-video
parentMarked ~hppa (bug #365203). (diff)
downloadhistorical-276fb334fec824fc70fcd072f87d73305ba8d1e6.tar.gz
historical-276fb334fec824fc70fcd072f87d73305ba8d1e6.tar.bz2
historical-276fb334fec824fc70fcd072f87d73305ba8d1e6.zip
Marked ~hppa (bug #365203).
Package-Manager: portage-2.2.0_alpha41/cvs/Linux i686
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/Manifest12
-rw-r--r--media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild4
3 files changed, 12 insertions, 9 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index bdb11e91b07d..aa16323a00a8 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.413 2011/05/24 12:44:22 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.414 2011/06/15 16:48:57 jer Exp $
+
+ 15 Jun 2011; Jeroen Roovers <jer@gentoo.org> ffmpeg-0.7_rc1.ebuild:
+ Marked ~hppa (bug #365203).
24 May 2011; Thomas Kahle <tomka@gentoo.org> ffmpeg-0.7_rc1.ebuild:
~x86 per bug 365203
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index b6e005bb14d4..a0a902452354 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
AUX avparser.patch 624 RMD160 87f9bd13d87e5560a36fe316e70e02fc0fa3a2c1 SHA1 3490a9f3553f6119eb1d16019f44c6ef36227453 SHA256 f5b1d3da4b007d28b6feca549260d82b0def7502353b7f7932d37852e64a37b3
AUX avutil_aes_sha_h.patch 1299 RMD160 fe7e1d94adb228d9d64f40c499db9f9382154515 SHA1 d5da6c76515782244bd3791194e0ac73d922d390 SHA256 e8c4f3701f6ff00a29c672594d3397507be81186a08862e11d4c976ebda3db93
@@ -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 8219 RMD160 941416d0a9a39b9f8b9407639a960cc71277ba15 SHA1 0d137fadf8444cdac79a47ec74dc838cc86f4caf SHA256 cf1a95316a1219951feebb1e8b884c7fda337c8f2e3cddf0c9af5e19a98c655b
+EBUILD ffmpeg-0.7_rc1.ebuild 8223 RMD160 c440a3f8aa5f6a6640e379c1e2ffc48f08fb87b2 SHA1 ac220db4945c9f3db284c93d008881de1d0cf201 SHA256 fd3843c72605abf8ba7889d4f5d08253fb71a3491231cab892c84d41a4317fe9
EBUILD ffmpeg-9999.ebuild 8238 RMD160 26123a557860016d70d1c40195648dbed26dd292 SHA1 c246860cb2f6f61e1a55c0c9e7f64ac465a81fe6 SHA256 ba0908e6b40886a37d8dc34b1877921b2ba245fa8f467f92e3a2b0525ba094d6
-MISC ChangeLog 61061 RMD160 541b39fb570b1eea5a2fc7f863b3cd27c2a267e4 SHA1 2fc0fe0bf22aba269a34e6ecbf61253bb8b6149b SHA256 a4d8346f580ee68e27f8adb832092bed1b3bb0def9f828771f500567e463064b
+MISC ChangeLog 61160 RMD160 9a94a97f89803b27f76fd3acc76e302c1266f82e SHA1 766803dcc59b49237ef9901623bd5dc5797bd2e2 SHA256 a3c61251b6768fcc2baea04755f8a2fa0a50845acb0b8e574128902d0e700806
MISC metadata.xml 2502 RMD160 7bae5e66cd6f15e3698d0a3cf08b5a3f653b4a25 SHA1 9d036b3eabb7a94a70a54d4c23d7efe0949817ff SHA256 fc5f64eea8d69b93f35e7c8a402d6322c46409e8cc5579a4b96f0fa50ea728ba
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk3bqIcACgkQodBTJSDyo66huAD/Uub+VPy7XNOucnCnx88m3uUX
-Ytjc651DOl7FchSb6jAA/3/BnV/gITrahdA6kuRw2kzIbYegQHUs1Ft2BDnXyvKT
-=SknF
+iEYEARECAAYFAk344n4ACgkQVWmRsqeSphNvtgCfUBcY9BIjD5XcmRevRbIA3qNu
+N3YAnRhRiLBn/v+9LHagidWzeaqEjAc8
+=wUSt
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild b/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild
index bc4ca23d3756..94ee8c623c4c 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.3 2011/05/24 12:44:22 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.7_rc1.ebuild,v 1.4 2011/06/15 16:48:57 jer 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 ~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