diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-01-30 21:58:21 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-01-30 21:58:21 +0000 |
| commit | f2e32eac367b110f812bba6ff4d0159273237cb6 (patch) | |
| tree | fef914905be14a699c169b6ad516ddb31a0fc0ef /media-video/ffmpeg2theora | |
| parent | Add =sci-geosciences/mapnik-0.7.1-r2 to boost-1.48 reverse dependencies (diff) | |
| download | gentoo-2-f2e32eac367b110f812bba6ff4d0159273237cb6.tar.gz gentoo-2-f2e32eac367b110f812bba6ff4d0159273237cb6.tar.bz2 gentoo-2-f2e32eac367b110f812bba6ff4d0159273237cb6.zip | |
Fix building with media-video/ffmpeg >= 0.10 wrt #401311 by Randy Andy
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'media-video/ffmpeg2theora')
| -rw-r--r-- | media-video/ffmpeg2theora/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild | 47 | ||||
| -rw-r--r-- | media-video/ffmpeg2theora/files/ffmpeg2theora-0.28-ffmpeg-0.10.patch | 15 |
3 files changed, 69 insertions, 1 deletions
diff --git a/media-video/ffmpeg2theora/ChangeLog b/media-video/ffmpeg2theora/ChangeLog index 3e723b187d07..638f5142808f 100644 --- a/media-video/ffmpeg2theora/ChangeLog +++ b/media-video/ffmpeg2theora/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-video/ffmpeg2theora # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.48 2012/01/04 17:56:51 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ChangeLog,v 1.49 2012/01/30 21:58:21 ssuominen Exp $ + +*ffmpeg2theora-0.28-r1 (30 Jan 2012) + + 30 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> + +ffmpeg2theora-0.28-r1.ebuild, +files/ffmpeg2theora-0.28-ffmpeg-0.10.patch: + Fix building with media-video/ffmpeg >= 0.10 wrt #401311 by Randy Andy 04 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> ffmpeg2theora-0.28.ebuild: diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild new file mode 100644 index 000000000000..2de820becd4c --- /dev/null +++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg2theora/ffmpeg2theora-0.28-r1.ebuild,v 1.1 2012/01/30 21:58:21 ssuominen Exp $ + +EAPI=4 +inherit eutils scons-utils + +DESCRIPTION="A simple converter to create Ogg Theora files." +HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/" +SRC_URI="http://www.v2v.cc/~j/${PN}/downloads/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="debug kate" + +RDEPEND="virtual/ffmpeg + >=media-libs/libvorbis-1.1 + >=media-libs/libogg-1.1 + >=media-libs/libtheora-1.1[encode] + kate? ( >=media-libs/libkate-0.3.7 )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +pkg_setup() { + myesconsargs=( + APPEND_CCFLAGS="${CFLAGS}" + APPEND_LINKFLAGS="${LDFLAGS}" + debug=$(usex debug 1 0) + prefix=/usr + mandir=PREFIX/share/man + libkate=$(usex kate 1 0) + ) +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-ffmpeg-0.10.patch +} + +src_compile() { + escons +} + +src_install() { + escons destdir="${D}" install + dodoc AUTHORS ChangeLog README subtitles.txt TODO +} diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.28-ffmpeg-0.10.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.28-ffmpeg-0.10.patch new file mode 100644 index 000000000000..9bc0809ca434 --- /dev/null +++ b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.28-ffmpeg-0.10.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/401311 + +--- src/ffmpeg2theora.c ++++ src/ffmpeg2theora.c +@@ -522,8 +522,8 @@ + AVStream *vstream = NULL; + AVCodec *acodec = NULL; + AVCodec *vcodec = NULL; +- pp_mode_t *ppMode = NULL; +- pp_context_t *ppContext = NULL; ++ pp_mode *ppMode = NULL; ++ pp_context *ppContext = NULL; + int sws_flags = this->resize_method; + float frame_aspect = 0; + double fps = 0.0; |