Add the gstreamer-2012.11 SDK git snapshot of gst-plugins-ffmpeg with additional backported patches from gst-plugins-libav-1.1 for libav-9 and (hopefully) ffmpeg-1.1 compatibility; should fix bug #423717. Pin existing ebuild to libav-0.8 and ffmpeg-0.10.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 96 insertions, 5 deletions

diff --git a/media-plugins/gst-plugins-ffmpeg/ChangeLog b/media-plugins/gst-plugins-ffmpeg/ChangeLog
index 0026aab00902..7e496716f121 100644
--- a/media-plugins/gst-plugins-ffmpeg/ChangeLog
+++ b/media-plugins/gst-plugins-ffmpeg/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-plugins/gst-plugins-ffmpeg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.151 2013/02/10 22:30:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/ChangeLog,v 1.152 2013/02/11 07:34:18 tetromino Exp $
+
+*gst-plugins-ffmpeg-0.10.13_p201211 (11 Feb 2013)
+
+  11 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gst-plugins-ffmpeg-0.10.13-r2.ebuild,
+  +gst-plugins-ffmpeg-0.10.13_p201211.ebuild:
+  Add the gstreamer-2012.11 SDK git snapshot of gst-plugins-ffmpeg with
+  additional backported patches from gst-plugins-libav-1.1 for libav-9 and
+  (hopefully) ffmpeg-1.1 compatibility; should fix bug #423717. Pin existing
+  ebuild to libav-0.8 and ffmpeg-0.10.
 
   10 Feb 2013; Agostino Sarubbo <ago@gentoo.org>
   gst-plugins-ffmpeg-0.10.13-r2.ebuild:
diff --git a/media-plugins/gst-plugins-ffmpeg/Manifest b/media-plugins/gst-plugins-ffmpeg/Manifest
index 37e736f2c608..b65168a56157 100644
--- a/media-plugins/gst-plugins-ffmpeg/Manifest
+++ b/media-plugins/gst-plugins-ffmpeg/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0.10.13-gcc-4.7.patch 1982 SHA256 25b4072e5269e019d4a10b8ecbe77987f63be29a9424863c7ed3342103ad25fa SHA512 bee06c1bc96f10e0feebe311f39f0c691dedf36c453d1d8613ec70c75a8d985a08dfc99eb984719e8e35fd631b9d1a89c6e5911dbe66110dfbee8f6043fd16da WHIRLPOOL 12e11b886c3944c963a41eb063a2484d4b164b5a29a587b8e19661ef93c1225356eae748d9672ab822115b7cf9615a62435f12692a40af09519e810d38081b33
 AUX 0.10.5/lavc.patch 8765 SHA256 aef53bcf9fcac97662df70858ea5a2e02c4661f695b5d0425d0ca6f4a53342ad SHA512 6936bdcef2f72d0d51edef262c0197f1d8efb781913abe750e35ea13958dfe0c4c0d2ec758163b1b44b4b0b33a24d0b1b94fd4f204b4a6cdb12fd39a96fbc272 WHIRLPOOL a514482d61691eea95425911458bf58d1d1370bb5be57bed02d23196e71ec2e737798eaf1e88036b0107a18c9b14e392ef91950eadc8d203845a636e1c6e2565
 AUX 0.10.5/offset.patch 525 SHA256 dd5ccdb6cc16d72f7dd94e89f549c32fe09a483b503369fa06e3b673d89d6d33 SHA512 f659a29c1fc97f157ab9de3c2a959a3c348dbc6d4a8ead6e27ea1748e63bc162c7ef2e050f04f008b110c6817b53eb4d24f8604e17f22501ceab544d3facd1cb WHIRLPOOL b48624958cbb429d1e4f11ec5dd9d92bb223d1327c6a99ca1a6e0f40a4ef899100253652c3c8dbb0208e17dd5877733ad070fe0e00f811f92d73fe9c49e0678e
@@ -5,8 +8,22 @@ AUX 0.10.5/system-ffmpeg-warning.patch 3567 SHA256 73c9cfa1006c6bca43d677a60ca8b
 AUX 0.10.6/system-ffmpeg-warning.patch 3547 SHA256 fccf0f672fc34fd03d156ba4d9498511858563ea2e9fbe3c217adc6a4f9abd6c SHA512 fb88d631cedad36958f89d6012d7f04e6f957577c10d9a1ae05040d5f9fd9482f1c871de1fc2c5d803989e92fdf219dfe14ccd84250343e0d7ecf5a1d84d371c WHIRLPOOL 9b22491b42442d1c66869c1bbdd475eb55d47a80ee9ed89a7d7f97b3e58e91fe6952fec5737ccb0a1c296b57fb384e284d0b92b68e58dbf0e6ca3a6a0825f659
 DIST gst-ffmpeg-0.10.11.tar.bz2 4250699 SHA256 ff36a138e5af4ed8dcc459d6d6521fe66ed31ec29ba9a924dc3675c6749a692e SHA512 2fc624ecdf1256aecf081eec9822a057e3b00c54483d2c3bf1d6ccaed67c440f602f30df8df24ec685c0330f88b7c076b707d26b3f658df71c986d69e9083eff WHIRLPOOL 8a7b093fed751ad680f53a995453f0f6f6547353edace36f9f6d36f02d20c5b21d8718e28af02b09a4c48e38715ca1442bdfe5804b3bc4d314be13ae153cf3d4
 DIST gst-ffmpeg-0.10.13.tar.bz2 4784059 SHA256 76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62 SHA512 f1141fc73b4bf1d774053ce53c4a67d5e600d6f0118ee7824cd2ff4fc8af8ba1dfbd5cf82d9e15872f3e6f8730112ddfc520a7d8df3cf605a9725e959f37e6ed WHIRLPOOL 62a018357bbb44b2cb762b7bcfb2f1a62b15b69c7a882c4a25655c0afc93e624460cc72984089dff392fc5ae852be0e6a66243c227a5ec0960d4defe8403aca7
+DIST gst-ffmpeg-0.10.13_p201211-libav-9-patches.tar.xz 14076 SHA256 5afa627ccbbedc1c80bfd419cb497c746aea0f27e0165a49c41947eba31774ee SHA512 cd12490600c0e56a85ec7436ec6152be8962c0e949ee9925ad64c114c60d7a72958f7c5ac98a3bdc6988bce707a2c40060e3a20b899ef2a95a30b4166bfb8145 WHIRLPOOL a7f17fd32112ba9df89ef80717946a50cc81e02e608c7cc15066987cd0e3556a1971ef5360ac50089d7c883aae5eb9d36ed3d7834fb7a075a816ceb16fa2b960
+DIST gst-ffmpeg-0.10.13_p201211.tar.xz 4285300 SHA256 cc15841b9972d1b60c9aaa3ffae14f3dbf44c0b08c14bb9319fb8956c89864c6 SHA512 9067aa92ef7613b08a51957d35d1de80897c28cb959522d9b523de6f482635dac3fe421015febb88ece624b7baee0216dd4b72e770bf92c05d8994f186d2f396 WHIRLPOOL 88ba2ce647ca821ef8f7aa22d64cf39397e30d8f34eadec475e6b627472c4baf6c7de6c60d4ca86527a67c710193dc00eb6534fe8bc92f73cc26db1f8e404a49
 EBUILD gst-plugins-ffmpeg-0.10.11-r1.ebuild 1153 SHA256 2dd65f12f7d5c6d346fc85b1feb57368933d3665a056c0563bed155c0b8835f6 SHA512 ebea81241dfea1ce1fdcbca209fc1c897d787036f0c8eb9ae5691c7c5c3a97352ec908319e59a612ee3612e65d13a9cb8bc5f6f6cce811723766fedf3b5cada2 WHIRLPOOL 1875ecff2d564f6a580af70de116a70d63f4fb76ee67d1932c261d4c1706a5e68a237808e63376a8536576b6af759e6530f5680816672cb09e8436d0d4e24c50
 EBUILD gst-plugins-ffmpeg-0.10.13-r1.ebuild 1252 SHA256 ba3b58b3b57694f50ddcc307efd17db0cfb1e625d16b5e61a51778a1cc9e6ae0 SHA512 ff0af7a595028cfd5e60bd479be4ef80a52de190fb56a13afe2c22d6e9f2fcdfebfd8338d313697c4d0effa19dbeb907f64d0ac7e52dc6aedf1628114bcbb88a WHIRLPOOL fb173a20cbddff4891a33bb45a15be1dd49ca19bd1a2b215454952662fc4b6109e57c664952c2a49b1400a3071af3e5e5da29a3eeab453acd06724e1895088d2
-EBUILD gst-plugins-ffmpeg-0.10.13-r2.ebuild 1392 SHA256 6b3f18677a07bb835656e57637bab8c682cbdfc2bdac225901eaeabc63cee976 SHA512 db6a3b96969119043ba739d857b8969185d8bb4e20576469f6d7198ce83cdcc1134d7762345a27827c84906a327f1dcd3ea7e08d2500bcd013c4a00db034d7a5 WHIRLPOOL 0ec62d488a71e4d06bcc5d68ed02efa71041ace143d2d5488d10c10c521c7055ab149c98f5c288970da708e3ce6e8977cc1bc3cb945006404f91cc2acca62b32
-MISC ChangeLog 23000 SHA256 d17afaa8ae84201c6621db60d61f8cb2e7bc3e0e1d0d003363f5ff765e842b4f SHA512 827055faac845e1e001444ec95b02ab1db302a19eeefe662572c10fc925aa7082a61d4a21bec0c20bec1354abf85b7d7b7236ea034ca7ed8f4724f9f3d96d77c WHIRLPOOL 809bfa3348d461633785709e3a1e6e2a600f49744a9cb62b6d6a4e83268ee430b6144e3aa92f52b831e447d8e63a9b44065213b63c6dac4df6148853d0f20654
+EBUILD gst-plugins-ffmpeg-0.10.13-r2.ebuild 1398 SHA256 966e7046a88d0433f98d83d5cf934447f506a659146fddc0ec3a47756882ae57 SHA512 3396fd11db439d5ac4c019fd17ab494b4c56b7162a9fb51b202059e8bbeee97f1d343d0618795918cdee8c8fdcddf58dc92733f67cdbcc36afe3622c05f750cc WHIRLPOOL 8a9602ee9d791b5acc401c5f4a8357b3aa4144b05d0047c17da1119cf86b46dcc2960a115c6ac3d8dcb515bc53bcf3ce686ef2c96de4bd2c5db4179f4f3b0ad5
+EBUILD gst-plugins-ffmpeg-0.10.13_p201211.ebuild 1871 SHA256 77a59c38aacb959af92fcac1e2644b44a460197722b63f84d179dd5208b1956b SHA512 33f7bf26ec62c3ce704a66795667b789a0318699dfc4eb24d361d36c6d1e6dd421e5f8e9bb81f6aa32433475b34541bf525f2b8e50e1ce1dd86e0e664c2a6d69 WHIRLPOOL e45fcef1bff5e8b9e7fed8c3985a628991d550a0ca426cb238ff57f8a502073da4c44cda30802f43518641c6cd307c1b5cb754db150eff8539a64924106d3c75
+MISC ChangeLog 23466 SHA256 5e61240f07a7e23ca8083c65021dc910240af03bc3909bd6d67b11c4dd6d647c SHA512 03a16a7c8ec08bcdff899cb3d84ca600931a9bc54334d9d9b603b9f4e95f6f436723d935749182af431b6588a8a69db15fb457b31d3b451d4a7a3646746aa0c7 WHIRLPOOL edf7749af88c9024b6e4a9ade4175dfcb81923bfcd56bf84d954829103e0c98e73e93316120772e830c7a9d841e761d61013863efe6c0399de430a659fad9497
 MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRGJ77AAoJEJ0WA1zPCt1hQkMIAKTphYJgZO1Ikdc6+iuqt9RV
+q04HX5JGFGUJgGVUI8U/mcdrHyZH/cH+YAhRo1FmaHi6AYFMBPxGDGELHtKGYqkL
+9uuJKcNAglGehsbmxiWrIQY3KiiIhZnNYNyJ3fEO8v5viH0u9TfQ2PN9f19SYvJa
+HQUvh822Hv5XEa747kHMQzS2w/yMyi3Qb5hWCtdUAT6YTjyDkWKd19wvZnfs7OCG
+RjS3RDW1aXqDKm1VTNo3RSPKWiSAtO/z/5/yTwKqhpXiCiY73gdcvbDetECSuQI1
+hzfdtv8XU562Tf4VfAC6VDO2VwHpoIUKneckchUr5dpCdKDYOv8oU4VG1EV3MjU=
+=q68B
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild
index 3cb0d15c1396..2a32302bd00f 100644
--- a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.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-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild,v 1.12 2013/02/10 22:30:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13-r2.ebuild,v 1.13 2013/02/11 07:34:18 tetromino Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ S=${WORKDIR}/${MY_P}
 # the libpostproc dep should be cleaned in future
 RDEPEND=">=media-libs/gstreamer-0.10.31:0.10
 	>=media-libs/gst-plugins-base-0.10.31:0.10
-	>=virtual/ffmpeg-0.10
+	=virtual/ffmpeg-0.10*
 	|| ( media-video/ffmpeg media-libs/libpostproc <media-video/libav-0.8.2-r1 )
 	orc? ( >=dev-lang/orc-0.4.6 )"
 DEPEND="${RDEPEND}
diff --git a/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.ebuild b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.ebuild
new file mode 100644
index 000000000000..dcf6c83454d7
--- /dev/null
+++ b/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-ffmpeg/gst-plugins-ffmpeg-0.10.13_p201211.ebuild,v 1.1 2013/02/11 07:34:18 tetromino Exp $
+
+EAPI=5
+
+inherit base eutils flag-o-matic
+
+MY_PN="gst-ffmpeg"
+MY_P=${MY_PN}-${PV}
+
+# Create a major/minor combo for SLOT
+PVP=(${PV//[-\._]/ })
+SLOT=${PVP[0]}.${PVP[1]}
+
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html"
+#SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}.tar.xz
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_P}-libav-9-patches.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+orc"
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=">=media-libs/gstreamer-0.10.31:0.10
+	>=media-libs/gst-plugins-base-0.10.31:0.10
+	>=virtual/ffmpeg-9
+	|| ( media-video/ffmpeg media-libs/libpostproc )
+	orc? ( >=dev-lang/orc-0.4.6 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -e 's/sleep 15//' -i configure.ac configure || die
+
+	# libav-9 support backported from gst-plugins-libav-1.1.0
+	epatch ../${MY_P}-libav-9-patches/*.patch
+
+	# monkey's audio requires planar audio support to be backported
+	sed -e 's#[ \t]elements/ffdemux_ape[^ ]*##' -i tests/check/Makefile.{am,in} || die
+}
+
+src_configure() {
+	# always use system ffmpeg if possible
+	econf \
+		--with-system-ffmpeg \
+		$(use_enable orc)
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	if has_version "media-video/ffmpeg"; then
+		elog "Please note that upstream uses media-video/libav"
+		elog "rather than media-video/ffmpeg. If you encoutner any"
+		elog "issues try to move from ffmpeg to libav."
+	fi
+}