summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Farina <zerochaos@gentoo.org>2012-07-02 17:05:25 +0000
committerRichard Farina <zerochaos@gentoo.org>2012-07-02 17:05:25 +0000
commit51a7b5b85ee09b7b17bc88f92bf4170c49e0aaa1 (patch)
tree94ad08a93c448fa08e854e74503551a3250d75a7 /virtual
parentmark stable for amd64 wrt bug #422465 (diff)
downloadhistorical-51a7b5b85ee09b7b17bc88f92bf4170c49e0aaa1.tar.gz
historical-51a7b5b85ee09b7b17bc88f92bf4170c49e0aaa1.tar.bz2
historical-51a7b5b85ee09b7b17bc88f92bf4170c49e0aaa1.zip
added speex and gsm use flags per bug #424327
Package-Manager: portage-2.1.11.3/cvs/Linux x86_64
Diffstat (limited to 'virtual')
-rw-r--r--virtual/ffmpeg/ChangeLog6
-rw-r--r--virtual/ffmpeg/Manifest24
-rw-r--r--virtual/ffmpeg/ffmpeg-0.10.3.ebuild8
3 files changed, 30 insertions, 8 deletions
diff --git a/virtual/ffmpeg/ChangeLog b/virtual/ffmpeg/ChangeLog
index f7679d880133..9c2d36bf0d90 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.42 2012/06/11 11:26:00 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ChangeLog,v 1.43 2012/07/02 17:05:25 zerochaos Exp $
+
+ 02 Jul 2012; Rick Farina <zerochaos@gentoo.org> ffmpeg-0.10.3.ebuild:
+ added speex and gsm use flags per bug #424327
11 Jun 2012; Benda Xu <heroxbd@gentoo.org> ffmpeg-0.10.3.ebuild:
keyword ~x86-linux
@@ -164,4 +167,3 @@
all useflags that are in use over main tree now. Also they are separated by
version so each package can depend on =virtual-version if there is some api
incompatibility.
-
diff --git a/virtual/ffmpeg/Manifest b/virtual/ffmpeg/Manifest
index cb326871a6fe..de5f454ff09f 100644
--- a/virtual/ffmpeg/Manifest
+++ b/virtual/ffmpeg/Manifest
@@ -1,4 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
EBUILD ffmpeg-0.10.2-r1.ebuild 729 RMD160 6f5cb0a1f3e09df787c29d90845e4794b6a81eb9 SHA1 ef9576ddc850725156e63ad91a112a21f367ed6e SHA256 72f4f73919922d858dc0c80b34ad6a077f097d0a09868e81d276bbd2cfbec56c
-EBUILD ffmpeg-0.10.3.ebuild 765 RMD160 0279477b0f82e6e5f07e2dc9f087ed9e5bfd9f4f SHA1 15485042d51f4eba8de27b02f1075c7c35b38d56 SHA256 0e3832248e409b0bcfb8b00a56688618ab4afb940d8e2deeb65f512381880b64
-MISC ChangeLog 6370 RMD160 b4ad77929189dc37ef3ab774521797cdda833288 SHA1 a7cc4400667faa1e55bcbb9f49d42172b8b4a327 SHA256 b8e6d215ebc86dc9847a6f0850846c8c233d9ca2cf3de645e72066d311ba6a42
+EBUILD ffmpeg-0.10.3.ebuild 801 RMD160 e7f55dc4560bdb06a490bfe20b9ccd05075136c7 SHA1 1379145c0c80c6ddde3fe17d313dd49b654b327c SHA256 721bff83a4eacf8c9ade2cb63bec2d189f68ff1668efa0e4de24763e83efd22a
+MISC ChangeLog 6492 RMD160 0f38fc6de51d24e87b17777c02250c3bf2ba8aea SHA1 6ece5301f6c2ab18afa77d977a7ce1311d60b14a SHA256 cc1b71def81c38bbf7da9036fda232f9a166833781049cf240168d881d1601f5
MISC metadata.xml 444 RMD160 fc60036f4c1ac0da29830090aa021ccc2e9cbe98 SHA1 82f158dc39f1300bf473282a3ce916534f0e44f1 SHA256 cef0fff52fc751969934693172e0c5f23fea1bddb44b0dc0ed68cb7bc00d1770
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJP8dToAAoJEKXdFCfdEflKlJUP/1aHJH2qMx4gLkxMYEz42Jru
+7cCv1YpzokEQcfPVGOoRB2YNtW5mWBDDnb3pAhrf3Dgv61eQHrJ6Id1IEcuL+yxt
+GVVzBQwHvn1lMil6Q2EcPLeiMSuSiDZskKFeakB398fuiSpub+uEEcShCK87kcXQ
+BmpJ7h0QC8S2gKqFKNsYxe/LT9waCEYY6XBthTjLOIeQ0Sma6IIqwdtAeOsrR3it
+r+gWn2BCnii60JonLHfckvgjImvVJOcuKw0tIHB53nbUttYJltlUzh6mlOAesIWC
+WFk+pAoKz/m/teg1vwm3NMBhXL7Wb04/6RUwHSVJYO1AYmsyP7FFzdO2eMHP49FG
+uwx2soFh1DsENAYV+0YWZ6G1G8bdN0n/oQsjaD+w0mHhmYDncjiFYoVKXhxgn52p
+WyVP3dsjbZR0bq4fNIE0NKHKiTQ0heSazZQn2kyw5/4EaCTdi6oqReKVyplcn90T
+SlmcC2W/ZNmDzpkjiDT8trzOuYvjWfRVQqD/Z8NQWsGyqhN1asuPZ68NkGXNWULt
+3CpFE8MOzlNTnuljnGGAt4QoBPvWB9ItfXLCNj0GZlXTsA2uRNJrwXZjrCzjvhtD
+1adXgbpYOuT05eHb2lv7Hm9FPVGFxODODhAYsNsA+scHVr6OBt9FTkTIgpbJEBmp
+77YwTcmtO+0alhqDTYro
+=C+Zp
+-----END PGP SIGNATURE-----
diff --git a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild b/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
index a003719c140f..a07e67c7b957 100644
--- a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
+++ b/virtual/ffmpeg/ffmpeg-0.10.3.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.3.ebuild,v 1.6 2012/06/11 11:26:00 heroxbd Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/ffmpeg/ffmpeg-0.10.3.ebuild,v 1.7 2012/07/02 17:05:25 zerochaos Exp $
EAPI=4
@@ -11,12 +11,12 @@ SRC_URI=""
LICENSE=""
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="X +encode jpeg2k mp3 sdl theora threads truetype vaapi vdpau x264"
+IUSE="X +encode gsm jpeg2k mp3 sdl speex theora threads truetype vaapi vdpau x264"
RDEPEND="
|| (
- >=media-video/ffmpeg-0.10.3[X?,encode?,jpeg2k?,mp3?,sdl?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
- >=media-video/libav-0.8.2-r2[X?,encode?,jpeg2k?,mp3?,sdl?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
+ >=media-video/ffmpeg-0.10.3[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
+ >=media-video/libav-0.8.2-r2[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
)
"
DEPEND=""