summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2009-07-04 08:20:56 +0000
committerAlexis Ballier <aballier@gentoo.org>2009-07-04 08:20:56 +0000
commit89a408d462ff8a108c1046a53c57883a6818fd18 (patch)
treed90c9e4055ec5638cabb3471a1a1be36d7002466 /media-video/ffmpeg
parentRemove unneeded doxygen and rails dependencies. (diff)
downloadhistorical-89a408d462ff8a108c1046a53c57883a6818fd18.tar.gz
historical-89a408d462ff8a108c1046a53c57883a6818fd18.tar.bz2
historical-89a408d462ff8a108c1046a53c57883a6818fd18.zip
Reflect upstream changes for the way of disabling libavdevice in/outdevs
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ChangeLog5
-rw-r--r--media-video/ffmpeg/Manifest10
-rw-r--r--media-video/ffmpeg/ffmpeg-9999-r1.ebuild10
3 files changed, 14 insertions, 11 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index a30c6ec016f9..2e3a7703e4da 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/ffmpeg
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.297 2009/07/03 19:36:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.298 2009/07/04 08:20:56 aballier Exp $
+
+ 04 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
+ Reflect upstream changes for the way of disabling libavdevice in/outdevs
03 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild:
force a non free license only when needed, ie, when faac or amr is
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index bf5f48b38646..e04d1eac55ef 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -5,13 +5,13 @@ DIST ffmpeg-0.4.9-p20090201.tar.bz2 2697161 RMD160 8cd01f4d6b6adc772d836de592dce
DIST ffmpeg-0.5.tar.bz2 2744768 RMD160 23b4a591c422f98b634eba0ba82817ad27a4ff07 SHA1 f930971bc0ac3d11a4ffbb1af439425c24f6f5b1 SHA256 16de61d7426b1df7aee54b48c16aa728de1ed82f95db5fc4d8886d5d2702d90a
EBUILD ffmpeg-0.4.9_p20090201.ebuild 6270 RMD160 9f5df63085a7c7851a3cae03b1a4429eaa60efc1 SHA1 63250edd4d6f7ecacf42b8a1ea176e3704bd85f2 SHA256 cb346a085c719dd5db7df5beebab4fd658777b4c2c7adc00a3cc4503d815bc3a
EBUILD ffmpeg-0.5-r1.ebuild 6221 RMD160 185cd17de11fbd1a1dcfd012188bc3cb11a542b5 SHA1 f28aaa9a372e93e5ee989acf66a1d214f58f8f23 SHA256 e91f04a5a5b69699f4f2532f1df67ef6e89ba5b47fb706828a3388727963a726
-EBUILD ffmpeg-9999-r1.ebuild 6331 RMD160 aa155a9a8804e0220ee2819da0f5599531a5114a SHA1 bff26b3f9add067ffb0568942ff9f1050a8e9267 SHA256 a0eb5e7f4692a0bb966df04164295b3b31d05d185299a9234ef5eac92289428f
-MISC ChangeLog 45108 RMD160 ba9e2cbc1c39f0e589b7a43d760cab65e6c70811 SHA1 54e7d3632c2a989d025cf988f2930640ce4e0664 SHA256 61d541cbfcba539aeb4d64514d2728ea9720885a80c1ea539debd2f2261febad
+EBUILD ffmpeg-9999-r1.ebuild 6329 RMD160 2215acc5801231fc2bebe5275753fa9537e6d330 SHA1 a73de87aa8e9bc20f41cf4413ca5eab899ab7cb0 SHA256 898cd3956140f11cbba9afe5fedbb96f0f71f5547480cb3f7d906246d6c9c635
+MISC ChangeLog 45259 RMD160 c26dc2b8804feeeb51984f736b3d2eb718150edf SHA1 8db1bf393a45a9b8da1c228bcd3415343e2a2cdf SHA256 1f281e3eefa0b644279ecbf35520c98ae2cf1d4e0e4815646dbf9b5bc2604705
MISC metadata.xml 1798 RMD160 bf7be02af72b3455d18eda5253da7e8a4cb5b4fd SHA1 efe70dc4c31f732c793f3b1b6820d27bea0ebd1e SHA256 8253fdc43d056bdc3787a1d6884db1b1268b8c4565c69864da80245860f904fa
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.12 (GNU/Linux)
-iEYEARECAAYFAkpOXdwACgkQvFcC4BYPU0pj+wCgkOIjnj2/p04tQ0JAmkKkQkIg
-zikAnjoeafto+qGS4j35JKCJUWCwBsM8
-=EmSb
+iEYEARECAAYFAkpPEO4ACgkQvFcC4BYPU0oEKwCgpACu/Z7qKUg06J5s/+GuLyaV
+fBwAoLMSFQLicUWM+MIdsxGnlydR8Gib
+=O584
-----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
index 27946b0a1a69..9067815f63d5 100644
--- a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.6 2009/07/03 19:36:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.7 2009/07/04 08:20:56 aballier Exp $
EAPI=2
@@ -84,13 +84,13 @@ src_configure() {
# libavdevice options
use ieee1394 && myconf="${myconf} --enable-libdc1394"
- # Demuxers
+ # Indevs
for i in v4l v4l2 alsa oss jack ; do
- use $i || myconf="${myconf} --disable-demuxer=$i"
+ use $i || myconf="${myconf} --disable-indev=$i"
done
- # Muxers
+ # Outdevs
for i in alsa oss ; do
- use $i || myconf="${myconf} --disable-muxer=$i"
+ use $i || myconf="${myconf} --disable-outdev=$i"
done
use X && myconf="${myconf} --enable-x11grab"