diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2013-04-21 12:55:51 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-04-21 12:55:51 +0000 |
| commit | 1a0314a3a4f40aa9e6dcf245ad15141f524f5e04 (patch) | |
| tree | f9ddefa6a5cdc69fd16aafb2ce2fbba7a56b5299 /media-video/ffmpeg2theora | |
| parent | Stable for arm, wrt bug #444242 (diff) | |
| download | gentoo-2-1a0314a3a4f40aa9e6dcf245ad15141f524f5e04.tar.gz gentoo-2-1a0314a3a4f40aa9e6dcf245ad15141f524f5e04.tar.bz2 gentoo-2-1a0314a3a4f40aa9e6dcf245ad15141f524f5e04.zip | |
Fix libav support, remove stray requirement
(Portage version: 2.1.11.62/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'media-video/ffmpeg2theora')
| -rw-r--r-- | media-video/ffmpeg2theora/ChangeLog | 5 | ||||
| -rw-r--r-- | media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/media-video/ffmpeg2theora/ChangeLog b/media-video/ffmpeg2theora/ChangeLog index 777d6e0e0916..77cdaf025f6e 100644 --- a/media-video/ffmpeg2theora/ChangeLog +++ b/media-video/ffmpeg2theora/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/ffmpeg2theora # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.57 2013/04/04 10:00:42 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.58 2013/04/21 12:55:51 lu_zero Exp $ + + 21 Apr 2013; Luca Barbato <lu_zero@gentoo.org> ffmpeg2theora-0.29.ebuild: + Fix libav support, remove stray requirement 04 Apr 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg2theora-0.29.ebuild: Depend on media-video/ffmpeg as it does not work with libav, bug #428106 diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild index 5f1fd7ea3111..7283d2a1c612 100644 --- a/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild +++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild,v 1.2 2013/04/04 10:00:42 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.29.ebuild,v 1.3 2013/04/21 12:55:51 lu_zero Exp $ EAPI=4 inherit eutils scons-utils @@ -14,9 +14,10 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="debug kate" -# || ( media-libs/libpostproc <media-video/libav-0.8.2-r1 media-video/ffmpeg ) RDEPEND=" - >=media-video/ffmpeg-0.10 + || ( media-libs/libpostproc + <media-video/libav-0.8.2-r1 media-video/ffmpeg ) + >=virtual/ffmpeg-0.10 >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] @@ -35,6 +36,10 @@ pkg_setup() { ) } +src_prepare() { + sed -i -e "/swresample/d" SConstruct || die +} + src_compile() { escons } |