Fix building with media-video/ffmpeg >= 0.10 wrt #401311 by Randy Andy

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 81 insertions, 7 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/Manifest b/media-video/ffmpeg2theora/Manifest
index c1fcf79234fa..45749d2abb3f 100644
--- a/media-video/ffmpeg2theora/Manifest
+++ b/media-video/ffmpeg2theora/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX ffmpeg2theora-0.28-ffmpeg-0.10.patch 414 RMD160 e0d325ed239f33a68f9f7900147cca6587325789 SHA1 a8d9cd59ab93f6742b6ad0a18f5f115ef51df41a SHA256 c878e2100cb95acb00c2a726c0a0cd5941c4e5f6f05de6230616996edca74eed
 DIST ffmpeg2theora-0.25.tar.bz2 80165 RMD160 470ca8fab5d82a44054f86825782a42dceee597f SHA1 71c5bf86e7cfc1b5248730019b9d606df464366d SHA256 e4599cf17b9739909bbb15011ff4a5ee9061360ab4ab02f5354297735e0826eb
 DIST ffmpeg2theora-0.26.tar.bz2 93202 RMD160 9e6fed1d4d8bd72e4e2d235b8cdcf35d0d5f5541 SHA1 fd4b2e31941a8abb42fe610c19dc5e59af7bf186 SHA256 b92534bfa98a9d9bdfccc81a96093a867a52a4c3f75c3b22a2445354672f014e
 DIST ffmpeg2theora-0.27.tar.bz2 95300 RMD160 a5fa860e8adcad1c550b95c22d5ecf136a2eb016 SHA1 7480eb53995707f3f37769f5bfb590e56f943ac6 SHA256 19be9113bfdae937d0ec5cd0e5b80d5b392196ec5b6fe5db945e66af27aa875a
@@ -8,13 +9,18 @@ DIST ffmpeg2theora-0.28.tar.bz2 95404 RMD160 4d21b10f745dcfb3a08c548ba248ea92681
 EBUILD ffmpeg2theora-0.25.ebuild 1136 RMD160 7e2c04cac306ee19cba9823e04ef13b3172c0c11 SHA1 d9a1279f24862c4b95bfc34a5480d512a574ac8c SHA256 11a447fbde17a7432cf39f825e515b163bcd3a78cfd2dde5bea6bb2b13d38232
 EBUILD ffmpeg2theora-0.26.ebuild 1110 RMD160 5e8e349cd923996535f281f61296d8ae42691f2b SHA1 cf7cf2bea5e89d88568b639a75d15b7ba895649b SHA256 cdd0bd4c2c7a3718cef6092c23d9ed73ceccfee44b61264235d4ad5511c6949d
 EBUILD ffmpeg2theora-0.27.ebuild 1132 RMD160 77cc3eb0772b4332a4acec9185761adfe30f699c SHA1 a078c6b6694430da88ff9ee7153d923bb7afecfc SHA256 766fe3e3ea3d918a59dd2c08ca04b1a4ad1ea272158361caf274c4707d895938
+EBUILD ffmpeg2theora-0.28-r1.ebuild 1118 RMD160 8b0c2171a907a0e19084fce27abde964937412f0 SHA1 b23c8d0379be183a76725b83d55e9d5e0fb46a8f SHA256 ab833b50af5529619d9d190ec1bd72c4c27182424799c3924bd695ad92fdf0ed
 EBUILD ffmpeg2theora-0.28.ebuild 1131 RMD160 268518434475e1ea2a1afe292493495297b10374 SHA1 181b2d183423aa5820acccadfb7b91c3b6c334b9 SHA256 6bb11bfc1446e3741d7ea849306d8684f9e11b142099687ddc870dafc7fdb727
-MISC ChangeLog 7319 RMD160 b309401bed24d51eb0e823631ed2ed4a3babf57f SHA1 8f3ec092a432d48c7f9f5053c854d9b5d22524b4 SHA256 184a7a88b1e4ff1dc028c68b411561027fc196984ea7b5978d24bcf5fee88379
+MISC ChangeLog 7562 RMD160 6747bcea0ab710f1554c995ba1c1d6277b521a33 SHA1 c2939621810688e7c1e88c82072a9013b8155476 SHA256 1b5de6384c12f111144abe3bd10fe9eda2f7ac7958bb70ed4913b67884a9f470
 MISC metadata.xml 319 RMD160 420e50dfeb9cbcda96febbb03051106edb78acdd SHA1 2dfaf300ebec11f2dfaaa99debb7b9f1b8dbb3a5 SHA256 0baf3db1e97a58c0210e91be4f08d6ecd30270f6875c0b63a77deab3aa85e530
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8EkukACgkQuUQtlDBCeQIe6QCgiEK+IdtF+hVoYjvteVpMgUST
-/p8AnjXmPqEF26PQ6A4ZdMF8SWZ/PvDV
-=2gpx
+iQEcBAEBAgAGBQJPJxHqAAoJEEdUh39IaPFNoBsH/30Ppy6Pvj0UI81eB3ZhdYCY
+fI7pfGUgoogi85QbQCJqhM7cE30U/GIMGyp6PqvxAJNwHtO0vDIsWXQEEngjQ15D
+OWAGLZzhCiWlPe/ij6AWmufHvNL3I4awlDyiO0szZvaokr27uU6ucxjHvUaUU+Gd
+QbHYKLhGG2huwBUYIFDDKewGNdYPG+93aV7DNTcUAlvnoMVp52TBOBWrX3PX5sgu
+C1H/MmoQXH35ujxvfJaAGQrVwX/foVVeFxgVEGc9iyrt7GrhaUo+VzDhdjwnMLkt
+j8tAaMMiqg1HaUq+9AMIhTGRdm288mRoHwdYc/IL0ZZVMZePKfn3qb5BdlQoKLw=
+=8Ppm
 -----END PGP SIGNATURE-----
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;