[gentoo-commits] proj/gnome:master commit in: media-libs/gstreamer/, media-libs/gstreamer/files/

[Gilles Dartiguelongue]

commit:     593b14c1c7d9d6f18221114fce29f7065c5a9d73
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  1 14:25:28 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Dec  1 14:40:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=593b14c1

media-libs/gstreamer: copy from gentoo-x86

Compare 0.10 series with 1.0 and update both as needed.

---
 ...er-0.10.36-disable-test_fail_abstract_new.patch |   35 ++++++++++++++++++++
 ...eamer-1.0.3.ebuild => gstreamer-0.10.36.ebuild} |   27 ++++++++++++---
 media-libs/gstreamer/gstreamer-1.0.3.ebuild        |    1 -
 3 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/media-libs/gstreamer/files/gstreamer-0.10.36-disable-test_fail_abstract_new.patch b/media-libs/gstreamer/files/gstreamer-0.10.36-disable-test_fail_abstract_new.patch
new file mode 100644
index 0000000..8162478
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-0.10.36-disable-test_fail_abstract_new.patch
@@ -0,0 +1,35 @@
+From e4707bfb24a8175018975a542f6e1c3b84ac02dd Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@g.o>
+Date: Sun, 21 Oct 2012 00:26:24 -0400
+Subject: [PATCH] test: disable test_fail_abstract_new
+
+Depending on how glib is configured, whether there are systemwide
+debugging tools running, etc., this test can produce other signals, not
+necessarily signal 11.
+---
+ tests/check/gst/gstobject.c | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/tests/check/gst/gstobject.c b/tests/check/gst/gstobject.c
+index d5956db..25995bf 100644
+--- a/tests/check/gst/gstobject.c
++++ b/tests/check/gst/gstobject.c
+@@ -531,15 +531,6 @@ gst_object_suite (void)
+ 
+   /* FIXME: GLib shouldn't crash here, but issue a warning and return a NULL
+    * object, or at least g_error() and then abort properly ... (tpm) */
+-#ifndef HAVE_OSX
+-  /* Disabled for OS/X because a) it's a pretty silly test anyway and
+-   * b) different OS/X versions raise different signals and it isn't worth
+-   * the effort to try and detect which one should be producing which
+-   */
+-  /* SEGV tests go last so we can debug the others */
+-  if (g_getenv ("CK_FORK") == NULL || strcmp (g_getenv ("CK_FORK"), "no") != 0)
+-    tcase_add_test_raise_signal (tc_chain, test_fail_abstract_new, SIGSEGV);
+-#endif
+ 
+   return s;
+ }
+-- 
+1.7.12.3
+

diff --git a/media-libs/gstreamer/gstreamer-1.0.3.ebuild b/media-libs/gstreamer/gstreamer-0.10.36.ebuild
similarity index 74%
copy from media-libs/gstreamer/gstreamer-1.0.3.ebuild
copy to media-libs/gstreamer/gstreamer-0.10.36.ebuild
index b2e9d8f..a8b5f2f 100644
--- a/media-libs/gstreamer/gstreamer-1.0.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.10.36.ebuild
@@ -11,21 +11,29 @@ HOMEPAGE="http://gstreamer.freedesktop.org/"
 SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
-SLOT="1.0"
+SLOT="0.10"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+introspection nls +orc test"
 
-RDEPEND=">=dev-libs/glib-2.32:2
-	dev-libs/libxml2
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )"
+RDEPEND=">=dev-libs/glib-2.24:2
+	>=dev-libs/libxml2-2.4.9
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
-	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/gtk-doc-am-1.3
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 # gtk-doc-am to install API docs
+RDEPEND="${RDEPEND}
+	!<media-libs/gst-plugins-base-0.10.26"
+	# ^^ queue2 move, mustn't have both libgstcoreleements.so and libgstqueue2.so at runtime providing the element at once
+
+src_prepare() {
+	# Disable silly test that's not guaranteed to pass on an arbitrary machine
+	epatch "${FILESDIR}/${PN}-0.10.36-disable-test_fail_abstract_new.patch"
+}
 
 src_configure() {
 	if [[ ${CHOST} == *-interix* ]] ; then
@@ -62,6 +70,15 @@ src_install() {
 	# Punt useless .la files
 	prune_libtool_files --modules
 
+	# Drop unversioned binaries
+	cd "${D}"/usr/bin
+	local gst_bins
+	for gst_bins in *-${SLOT} ; do
+		[[ -e ${gst_bins} ]] || continue
+		rm ${gst_bins/-${SLOT}/}
+		elog "Removed ${gst_bins/-${SLOT}/}"
+	done
+
 	# Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
 	use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}" \
 		"${ED}usr/libexec/gstreamer-${SLOT}/gst-plugin-scanner"

diff --git a/media-libs/gstreamer/gstreamer-1.0.3.ebuild b/media-libs/gstreamer/gstreamer-1.0.3.ebuild
index b2e9d8f..85a5f78 100644
--- a/media-libs/gstreamer/gstreamer-1.0.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.0.3.ebuild
@@ -16,7 +16,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
 IUSE="+introspection nls +orc test"
 
 RDEPEND=">=dev-libs/glib-2.32:2
-	dev-libs/libxml2
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils