Add gst-plugins-libav-1.1 prerelease for libav-9 and ffmpeg-1.1 compatibility (bug #423717). Pin gst-plugins-libav-1.0.x to libav-0.8 and ffmpeg-0.10.

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

6 files changed, 126 insertions, 12 deletions

diff --git a/media-plugins/gst-plugins-libav/ChangeLog b/media-plugins/gst-plugins-libav/ChangeLog
index d1efd895e287..eff19514e087 100644
--- a/media-plugins/gst-plugins-libav/ChangeLog
+++ b/media-plugins/gst-plugins-libav/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/gst-plugins-libav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.5 2013/01/21 23:10:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.6 2013/02/03 23:22:12 tetromino Exp $
+
+*gst-plugins-libav-1.1.0_pre20130128 (03 Feb 2013)
+
+  03 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gst-plugins-libav-1.0.3.ebuild, gst-plugins-libav-1.0.5.ebuild,
+  +gst-plugins-libav-1.1.0_pre20130128.ebuild,
+  +files/gst-plugins-libav-1.1.0_pre20130128-gbr-color.patch:
+  Add gst-plugins-libav-1.1 prerelease for libav-9 and ffmpeg-1.1 compatibility
+  (bug #423717). Pin gst-plugins-libav-1.0.x to libav-0.8 and ffmpeg-0.10.
 
 *gst-plugins-libav-1.0.5 (21 Jan 2013)
 
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index dccb6020d579..cfbbb45093bf 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -1,16 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gst-plugins-libav-1.1.0_pre20130128-gbr-color.patch 1001 SHA256 120f5a118cfb71ed8eb03e015e49955ed38bf09a5dd7f9768054219a2e348e24 SHA512 7f29af719101821b88a19a46c2325021724e7f555260ff2a6448f45a87f39df303eae08aa1ef9509ccde467dc9f7e3f3cdcc2611ddd7d1b4f4cfb72f6f21364d WHIRLPOOL 987c420ea0be285c1a8c298080012f14ec8c4de31e5c653d0f312d2be40c32c935a6481e793922d969696dab70a90d9e1b45b74359775723fdceec5dcc9d19cc
 DIST gst-libav-1.0.3.tar.xz 4235032 SHA256 5193f158e2554a9450325dbb0c60e8f4b6b8a9244ae10ea07d0f7418a0e07959 SHA512 b59b2abe3e841712948b2f3b3b78ce49573e0623880a4f11089a636c89268d3f79863c1a0975cd7e5bf4bf40a86f0d2370cf03511e2751d2cd39887733524be8 WHIRLPOOL 8b98829ccb9f160c8209f22fd44c5776d156a6d7e9b3d5526149521ed4b02a319ef7cd4d9df550133714433d93eb2dba211dfe83e1c03776885844ae71c1e518
 DIST gst-libav-1.0.5.tar.xz 4234992 SHA256 aef8be665096b3a4e64424fb39d7c5da57faaaf95e9fea6c1bb44295d4fb32d5 SHA512 36d5147ddf41caac34db4c5095499e84f8f832cd87c8b6fdf99055d2703e899c945494d0478cbc77b37a6dd62f71d614f033bde566b1658831f5fc286cee4ba3 WHIRLPOOL c5163259734d89f0fc1b15bebbe87cf49fd4611ba831a7f0d98086cc9afe17bdb0fb14e718e6852dd94f72c0a0e8d1290bf047d903e3f0bc7350d55c6190f6f0
-EBUILD gst-plugins-libav-1.0.3.ebuild 1427 SHA256 b70bc96a761a6678b179145d1194510924436a1ff5f2f64b13ec74043c626c62 SHA512 33d57b07f7305661ae40a063c58d2d50181f08685a748218b5ce8aaf553c06c839546ac38b5c974ea8949819f9bd6be754aafda7e2943454c929b43ab1de4de1 WHIRLPOOL 881428b6a299673504a7642fbe846144602030bcd616cb61b758757bb0dfb1d7cb03ee8b8b491039b9c43148596e64d35947388593cd73cd55425ad1f902edec
-EBUILD gst-plugins-libav-1.0.5.ebuild 1524 SHA256 95dd0f04506b84690a9e710c242bc03b365cab092e533ff99e36a70e0ecaa808 SHA512 2f1721dd39c290c88feebc24524b7cebb872b931e7732cc830a74d2825fe03c68e7788ef82421afddeab4871aaa49bf770d5d252922cae2195c459f9ffb6e132 WHIRLPOOL 7ca7b1912faf773240211054ccdc4079ca3757804d27c282dfcbdfdf005ec98ef18e1f92cb4ee503f4f4f5e110e6580d03fcf189179bdc96944e06d386d56e9e
-MISC ChangeLog 1102 SHA256 f95ac011db48f5fc493d07393844c5ef48d3c1f3b52f6c12284cd6c1aea43da5 SHA512 f23fa5e39573b2861b73db99046157e7086e55e4b7acb5f3765011d218ec6928793ed2f5523bc50cb1fa19a6a08a3d74c451e458a2250b3172438663a03ca6d8 WHIRLPOOL a5fd116324d3291cdae179bdf5cb8a5aa3524e81cacc0102e25e3801bd85660b0f0fb65c62b5bca597a833d116549924c00b5bb0ca53a03417e3c2df0be22c51
+DIST gst-libav-1.1.0_pre20130128.tar.xz 477668 SHA256 c746d093b5ad4a6d325361217c49b35817ab0a257504d54b92ef0302820f66b4 SHA512 525d393b1fe665652798bd50859f6e5317b164c3edf7e20f4bc66a2d2c09e6345c2aacf80f8592306da0945325e7a22b0238bb868393df304fbdb4c8956cf338 WHIRLPOOL bb10a0d741997212556e88f2cec32bc93375e5a8c89b3b6ef3bc598a2c9ab8f8985b42b0585d5c2ff3ca08433276f094dca7194e1b660f8199fd276d2e531a8c
+EBUILD gst-plugins-libav-1.0.3.ebuild 1426 SHA256 e6252d25cc95b2458c2be728d8b208bc580018e7bf4c042e402a3052e1a1d2c4 SHA512 964446d48b00e71211a990270e1f6668a36610e9730f0a0207a9393a4c747c388541fc84413f298e59adfc4167ef026efba74fd6320ef5dfd6343e9b74aa1ae0 WHIRLPOOL e0ffb819e0239c215b10f817edf86e985aa5c3743c0fc3ee166dfc3aecd46dbb6f705e74d41d14fcb427b7e3a5ccef7cf134bc08f98813bc24e9274acf2e0644
+EBUILD gst-plugins-libav-1.0.5.ebuild 1529 SHA256 f63efcd1438dbd4960e95fc32d55e8013ed0e5f70c97d272e33a74aa423df580 SHA512 9d4ab7b5b9b34a7ce5f36c3dfaaf50b6750f91a9cbdddecc73f8111bff999a6a85f9106d47753b1758ed8d5f3429c2457f09be2f60c861060f06a2e5e4c6f990 WHIRLPOOL ed5c2621daa24ff30ce511cb6dc1f7c0a99ab36e26efc81fdcca1133ed739d8b5cd57ff48e8516c6bfaf744c3b88124e42a81fb22cc8ce977b0caa9774faabcb
+EBUILD gst-plugins-libav-1.1.0_pre20130128.ebuild 1904 SHA256 46a1c2b8edc41db2d22bb22a027368a53e32ad5b7a18c117852fef5ea4ebf522 SHA512 766a536bd0eeb312177cdaa0f1873877712c20a02eec635e876be228a2eec58ec8060ee61882d5ea443e3003e6c928ca65e7f8b5fa1f9f95fa3fd46608379d95 WHIRLPOOL f8e38ef931c9c5d372d865ca017376e9a1c7b5a5fa426b57f423a715df45e1e5d2407c30b9fd81e9c3af813706bf1f41d04ea70cfca88bd0cd011c18fc644683
+MISC ChangeLog 1550 SHA256 c84305dedf6f4721049a6d361bf2ef987015d09e55c6ed308998de8a81e5d523 SHA512 1c436dc37f187eed20bf5690b4ec87bc10179e3b37974522fd5fa80a184ce30f000819c008c0265b09c1f149bbd7eccad9757c5ebd798244417c6ef6176cdc7c WHIRLPOOL 4ee5a17e83c9ca7256ad32f4b5d0889c6f90310a77cca257b66a76ff98e35b62f24d3eb952f0239dbbb18b2d04a5b8710b4440a2b8ef87e8c2fa7ed789966b6e
 MISC metadata.xml 163 SHA256 5be82689c9f32031a2438b08ace0c4bcdc738cec0eb736d9aa7e529cde4b8a6c SHA512 9688f0e23097fe5baefa6b3cf28276c88e53314989b51e1afc9edc0e68a19c215a67dd0bfb84a157b130d424912ac72bf6c85f9ce066c8d9f6776e4c1d019ccc WHIRLPOOL 6609d5606451d3adf31c010aeb51bec29714c3cda8e1a730af0ea1f51289f7139ac86f11c056e59143dddcf46291b9d79ae94083b77488f28717bf51972e0c3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlD9yvgACgkQ1fmVwcYIWAaQQQCeLyznLCzASGFTEXQGK0+ovtRm
-7EEAn3mh9rXAKmqzciJAfOdQx8yuklW0
-=SZhb
+iQEcBAEBCAAGBQJRDvElAAoJEJ0WA1zPCt1hDg8IAKXrXRHF2VIwm86ksGXkr/H3
+gpH9Zd2uQltNN4mn2bzzkPdb5nVFErm4hqUbH3mB8ScnyRCRxEciBP6gJ6zfJNiO
+4F61OyVzsAufoMOhR/Mjsr2aND87ES4EOszxMSTgtG21tTf9fhMsbwYmTWAAEsjd
+lwZhBJAnwHqXvS0T/9X6WZoIxQBaDAuHzXwZnBN5nsRtg4YzS8dfrTneoStR79w4
+S9b3t1RjvW3EkaWSJ4SFuxlLRXaoeS6nZ4i8RzapwB7RXjHUfN5Ffvc87/S/YVna
+IAPNDZrwtZk1EztL64nYKTvp/2MmhwDAvCGIlhJPYPz9UW5LN6aqo2IZhTZ3I6w=
+=8QGy
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-gbr-color.patch b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-gbr-color.patch
new file mode 100644
index 000000000000..d12554943f72
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/files/gst-plugins-libav-1.1.0_pre20130128-gbr-color.patch
@@ -0,0 +1,28 @@
+From 67e11c7ad916c2e0b9af99153a01be378ea174c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
+Date: Sat, 10 Nov 2012 16:57:06 +0100
+Subject: [PATCH] avcodecmap: Add mappings for the GBR color formats
+
+---
+ ext/libav/gstavcodecmap.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/ext/libav/gstavcodecmap.c b/ext/libav/gstavcodecmap.c
+index abf8f92..5d7dd23 100644
+--- a/ext/libav/gstavcodecmap.c
++++ b/ext/libav/gstavcodecmap.c
+@@ -2182,6 +2182,11 @@ static const PixToFmt pixtofmttable[] = {
+   {GST_VIDEO_FORMAT_I420_10BE, PIX_FMT_YUV420P10BE},
+   {GST_VIDEO_FORMAT_I422_10LE, PIX_FMT_YUV422P10LE},
+   {GST_VIDEO_FORMAT_I422_10BE, PIX_FMT_YUV422P10BE},
++  {GST_VIDEO_FORMAT_Y444_10LE, PIX_FMT_YUV444P10LE},
++  {GST_VIDEO_FORMAT_Y444_10BE, PIX_FMT_YUV444P10BE},
++  {GST_VIDEO_FORMAT_GBR, PIX_FMT_GBRP},
++  {GST_VIDEO_FORMAT_GBR_10LE, PIX_FMT_GBRP10LE},
++  {GST_VIDEO_FORMAT_GBR_10BE, PIX_FMT_GBRP10BE},
+ };
+ 
+ GstVideoFormat
+-- 
+1.8.1.2
+
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.3.ebuild
index a93a88d174e9..d3c1702c2df4 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.3.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-libav/gst-plugins-libav-1.0.3.ebuild,v 1.3 2012/12/09 08:54:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.3.ebuild,v 1.4 2013/02/03 23:22:12 tetromino Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ IUSE="+orc"
 
 RDEPEND="
 	media-libs/gst-plugins-base:1.0
-	>=virtual/ffmpeg-0.10.3
+	~virtual/ffmpeg-0.10.3
 	orc? ( >=dev-lang/orc-0.4.16 )
 "
 DEPEND="${RDEPEND}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.5.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.5.ebuild
index f5f7724f1b8a..68ab201fda85 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.5.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.5.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-libav/gst-plugins-libav-1.0.5.ebuild,v 1.1 2013/01/21 23:10:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.0.5.ebuild,v 1.2 2013/02/03 23:22:12 tetromino Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ IUSE="+orc"
 RDEPEND="
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
-	>=virtual/ffmpeg-0.10.3
+	~virtual/ffmpeg-0.10.3
 	orc? ( >=dev-lang/orc-0.4.16 )
 "
 DEPEND="${RDEPEND}
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.1.0_pre20130128.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.1.0_pre20130128.ebuild
new file mode 100644
index 000000000000..1df92e2c2765
--- /dev/null
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.1.0_pre20130128.ebuild
@@ -0,0 +1,70 @@
+# 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-libav/gst-plugins-libav-1.1.0_pre20130128.ebuild,v 1.1 2013/02/03 23:22:12 tetromino Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+MY_PN="gst-libav"
+DESCRIPTION="FFmpeg based gstreamer plugin"
+HOMEPAGE="http://gstreamer.freedesktop.org/modules/gst-libav.html"
+#SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
+SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${MY_PN}-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=virtual/ffmpeg-9
+	orc? ( >=dev-lang/orc-0.4.16 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	sed -e 's/sleep 15//' -i configure.ac configure || die
+
+	# allow building with gstreamer-1.0.x
+	sed -e 's/REQ=1.1.0/REQ=1.0.0/' -i configure.ac configure || die
+	# Disable GBR color support; it requires >=gst-plugins-base-1.1
+	epatch -R "${FILESDIR}/${P}-gbr-color.patch"
+}
+
+src_configure() {
+	GST_PLUGINS_BUILD=""
+	# always use system ffmpeg/libav if possible
+	econf \
+		--disable-maintainer-mode \
+		--with-package-name="Gentoo GStreamer ebuild" \
+		--with-package-origin="http://www.gentoo.org" \
+		--with-system-libav \
+		$(use_enable orc)
+}
+
+src_compile() {
+	# Don't build with -Werror
+	emake ERROR_CFLAGS=
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	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 encounter any"
+		elog "issues try to move from ffmpeg to libav."
+	fi
+}