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.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

5 files changed, 113 insertions, 6 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/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
+}