Fix dependencies, x11 automagic for now, see upstream bug. Make mesa optional behing egl USE flag, it is used by eglglessink only.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key C6085806)

5 files changed, 116 insertions, 4 deletions

diff --git a/media-libs/gst-plugins-bad/ChangeLog b/media-libs/gst-plugins-bad/ChangeLog
index 3e2a4a009517..ff5bccee50c6 100644
--- a/media-libs/gst-plugins-bad/ChangeLog
+++ b/media-libs/gst-plugins-bad/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/gst-plugins-bad
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/ChangeLog,v 1.126 2013/10/04 01:24:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/ChangeLog,v 1.127 2013/10/06 22:20:25 eva Exp $
+
+*gst-plugins-bad-1.2.0-r1 (07 Oct 2013)
+
+  07 Oct 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  gst-plugins-bad-1.2.0.ebuild, +gst-plugins-bad-1.2.0-r1.ebuild,
+  +files/gst-plugins-bad-1.2.0-optional-egl.patch, metadata.xml:
+  Fix dependencies, x11 automagic for now, see upstream bug. Make mesa optional
+  behing egl USE flag, it is used by eglglessink only.
 
   04 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   gst-plugins-bad-1.2.0.ebuild:
diff --git a/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.2.0-optional-egl.patch b/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.2.0-optional-egl.patch
new file mode 100644
index 000000000000..a4df03d57e0a
--- /dev/null
+++ b/media-libs/gst-plugins-bad/files/gst-plugins-bad-1.2.0-optional-egl.patch
@@ -0,0 +1,36 @@
+From 54077b9aeffa0b8e2338d55c2097a1758128c7dc Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 6 Oct 2013 17:37:38 +0200
+Subject: [PATCH] Allow disabling gstreamer-egl
+
+---
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4f6b85b..1814496 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -494,7 +494,7 @@ if test x"$EGL_WINDOW_SYSTEM" = x"auto"; then
+ fi
+ 
+ case "$EGL_WINDOW_SYSTEM" in
+-  x11|none)
++  x11)
+     PKG_CHECK_MODULES(EGL, egl, HAVE_EGL="yes", [
+       HAVE_EGL="no"
+       old_LIBS=$LIBS
+@@ -594,6 +594,10 @@ case "$EGL_WINDOW_SYSTEM" in
+     LIBS=$old_LIBS
+     CFLAGS=$old_CFLAGS
+     ;;
++  none|no)
++    HAVE_EGL="no"
++    AC_MSG_WARN([No EGL window system specified, will not build gstreamer-egl])
++    ;;
+   *)
+     AC_MSG_ERROR([invalid EGL window system specified])
+     ;;
+-- 
+1.8.3.2
+
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..ccaacaab9a8f
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0-r1.ebuild,v 1.1 2013/10/06 22:20:25 eva Exp $
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic gst-plugins-bad gst-plugins10
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="egl +introspection +orc vnc"
+
+# FIXME: we need to depend on mesa to avoid automagic on egl
+# dtmf plugin moved from bad to good in 1.2
+# X11 is automagic for now, upstream #709530
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=media-libs/gst-plugins-base-1.2:${SLOT}
+	>=media-libs/gstreamer-1.2:${SLOT}
+	egl? ( media-libs/mesa[egl] )
+	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
+	orc? ( >=dev-lang/orc-0.4.17 )
+
+	!<media-libs/gst-plugins-good-1.1:${SLOT}
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.12
+"
+
+src_prepare() {
+	# Make dependency on mesa optional, only needed by eglglessink
+	epatch "${FILESDIR}"/${PN}-1.2.0-optional-egl.patch
+	eautoreconf
+
+	# gettextize removes this line making gst-plugins-bad install
+	# translation file .mo instead of gst-plugins-bad-1.0.mo
+	sed -e '/SHELL =.*/ a\GETTEXT_PACKAGE = @GETTEXT_PACKAGE@\' \
+		-i po/Makefile.in.in || die
+}
+
+src_configure() {
+	strip-flags
+	replace-flags "-O3" "-O2"
+	filter-flags "-fprefetch-loop-arrays" # (Bug #22249)
+
+	gst-plugins10_src_configure \
+		$(use_enable introspection) \
+		$(use_enable orc) \
+		$(use_enable vnc librfb) \
+		--disable-examples \
+		--disable-debug \
+		--with-egl-window-system=$(usex egl x11 none)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+	default
+	prune_libtool_files --modules
+}
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild
index c19cb188bcb6..d828a53c6b86 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.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-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild,v 1.3 2013/10/04 01:24:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins-bad/gst-plugins-bad-1.2.0.ebuild,v 1.4 2013/10/06 22:20:25 eva Exp $
 
 EAPI="5"
 
@@ -19,8 +19,7 @@ RDEPEND="
 	>=dev-libs/glib-2.32:2
 	>=media-libs/gst-plugins-base-1.2:${SLOT}
 	>=media-libs/gstreamer-1.2:${SLOT}
-	media-libs/mesa
-	x11-libs/libX11
+	media-libs/mesa[egl]
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 	orc? ( >=dev-lang/orc-0.4.17 )
 
diff --git a/media-libs/gst-plugins-bad/metadata.xml b/media-libs/gst-plugins-bad/metadata.xml
index d1096fb54bd8..c4beec691ea5 100644
--- a/media-libs/gst-plugins-bad/metadata.xml
+++ b/media-libs/gst-plugins-bad/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gstreamer</herd>
+	<use>
+		<flag name="egl">Enable EGL support</flag>
+	</use>
 </pkgmetadata>