diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-07-07 08:13:30 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-07-07 08:13:30 +0000 |
| commit | a55e5a75187b918cd14b42697ca03740a4933fe7 (patch) | |
| tree | 794c0b3db5f45105916e16567303d8b7db02454a /media-video/ffmpeg | |
| parent | fixed hpux build (diff) | |
| download | historical-a55e5a75187b918cd14b42697ca03740a4933fe7.tar.gz historical-a55e5a75187b918cd14b42697ca03740a4933fe7.tar.bz2 historical-a55e5a75187b918cd14b42697ca03740a4933fe7.zip | |
Drop libamr support, its been removed upstream
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'media-video/ffmpeg')
| -rw-r--r-- | media-video/ffmpeg/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg/Manifest | 12 | ||||
| -rw-r--r-- | media-video/ffmpeg/ffmpeg-9999-r1.ebuild | 12 |
3 files changed, 14 insertions, 15 deletions
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog index 2e3a7703e4da..97627774e94f 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.298 2009/07/04 08:20:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.299 2009/07/07 08:13:30 aballier Exp $ + + 07 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild: + Drop libamr support, its been removed upstream 04 Jul 2009; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999-r1.ebuild: Reflect upstream changes for the way of disabling libavdevice in/outdevs diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index e04d1eac55ef..3ba446b3311d 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 6329 RMD160 2215acc5801231fc2bebe5275753fa9537e6d330 SHA1 a73de87aa8e9bc20f41cf4413ca5eab899ab7cb0 SHA256 898cd3956140f11cbba9afe5fedbb96f0f71f5547480cb3f7d906246d6c9c635 -MISC ChangeLog 45259 RMD160 c26dc2b8804feeeb51984f736b3d2eb718150edf SHA1 8db1bf393a45a9b8da1c228bcd3415343e2a2cdf SHA256 1f281e3eefa0b644279ecbf35520c98ae2cf1d4e0e4815646dbf9b5bc2604705 +EBUILD ffmpeg-9999-r1.ebuild 6099 RMD160 93d646e48809ce426ec476384d7934179215fc0d SHA1 75a3c80a5ffe4eaacd41749665f92c28054613fd SHA256 8a46e1709009c53b0b31b0a9d1698edfd3bfebef2a9423f77df31509223ac224 +MISC ChangeLog 45384 RMD160 3085e8afe563282ee0984186cdf2f96e0a6a7c9b SHA1 65b93497f9ca5b8a7a901f989b21eed9b965f5a6 SHA256 4fd919d6359932fde7d3dcb37d04dd9faf91cb59dd3b8c3d8b1c435c1a48ad7d MISC metadata.xml 1798 RMD160 bf7be02af72b3455d18eda5253da7e8a4cb5b4fd SHA1 efe70dc4c31f732c793f3b1b6820d27bea0ebd1e SHA256 8253fdc43d056bdc3787a1d6884db1b1268b8c4565c69864da80245860f904fa -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.12 (GNU/Linux) +Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkpPEO4ACgkQvFcC4BYPU0oEKwCgpACu/Z7qKUg06J5s/+GuLyaV -fBwAoLMSFQLicUWM+MIdsxGnlydR8Gib -=O584 +iEYEARECAAYFAkpTA6UACgkQvFcC4BYPU0r3pwCgpOvPX8bqC6A8b7s4BbPlFxFK +C1cAn08dCsUlbdvV8oynEsQ1430dl2Kr +=pRdp -----END PGP SIGNATURE----- diff --git a/media-video/ffmpeg/ffmpeg-9999-r1.ebuild b/media-video/ffmpeg/ffmpeg-9999-r1.ebuild index 9067815f63d5..60acae504044 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.7 2009/07/04 08:20:56 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999-r1.ebuild,v 1.8 2009/07/07 08:13:30 aballier Exp $ EAPI=2 @@ -15,7 +15,7 @@ HOMEPAGE="http://ffmpeg.org/" LICENSE="GPL-3" SLOT="0" KEYWORDS="" -IUSE="+3dnow +3dnowext alsa altivec amr cpudetection custom-cflags debug dirac +IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac doc ieee1394 +encode faac faad gsm ipv6 jack +mmx +mmxext vorbis test theora threads x264 xvid network zlib sdl X mp3 opencore-amrnb opencore-amrwb oss schroedinger +hardcoded-tables bindist v4l v4l2 @@ -42,8 +42,7 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.10 ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) jack? ( media-sound/jack-audio-connection-kit ) - X? ( x11-libs/libX11 x11-libs/libXext ) - amr? ( media-libs/amrnb media-libs/amrwb )" + X? ( x11-libs/libX11 x11-libs/libXext )" DEPEND="${RDEPEND} >=sys-devel/make-3.81 @@ -109,14 +108,11 @@ src_configure() { fi if use bindist then - use amr && ewarn "libamr is nonfree and cannot be distributed; disabling amr support." use faac && ewarn "faac is nonfree and cannot be distributed; disabling faac support." else - use amr && myconf="${myconf} --enable-libamr-nb \ - --enable-libamr-wb" use faac && myconf="${myconf} --enable-libfaac" - { use faac || use amr ; } && myconf="${myconf} --enable-nonfree" + { use faac ; } && myconf="${myconf} --enable-nonfree" fi # CPU features |