Fix gst-0.8 gcc4 sparc builds, see http://bugzilla.gnome.org/show_bug.cgi?id=312812

(Portage version: 2.1.2-r9)

4 files changed, 39 insertions, 5 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index dc16a4443b5e..94a5609e3d68 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/gstreamer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.169 2007/02/12 19:12:57 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.170 2007/02/15 14:49:50 gustavoz Exp $
+
+  15 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  +files/cothreads-gcc4.patch, gstreamer-0.8.11.ebuild,
+  gstreamer-0.8.12.ebuild:
+  Fix gst-0.8 gcc4 sparc builds, see
+  http://bugzilla.gnome.org/show_bug.cgi?id=312812
 
   12 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
   gstreamer-0.10.11.ebuild:
diff --git a/media-libs/gstreamer/files/cothreads-gcc4.patch b/media-libs/gstreamer/files/cothreads-gcc4.patch
new file mode 100644
index 000000000000..a9b37eda38e6
--- /dev/null
+++ b/media-libs/gstreamer/files/cothreads-gcc4.patch
@@ -0,0 +1,24 @@
+diff -urN gstreamer-0.8.10.orig/gst/cothreads.c gstreamer-0.8.10/gst/cothreads.c
+--- gstreamer-0.8.10.orig/gst/cothreads.c	2004-11-02 16:02:11.000000000 +0100
++++ gstreamer-0.8.10/gst/cothreads.c	2005-08-07 15:19:11.000000000 +0200
+@@ -651,7 +651,7 @@
+     makecontext (&ucp, cothread_stub, 0);
+     setcontext (&ucp);
+ #else
+-    GST_ARCH_SETUP_STACK ((char *) cothread->sp);
++    GST_ARCH_SETUP_STACK (cothread->sp);
+     GST_ARCH_SET_SP (cothread->sp);
+     /* start it */
+     GST_ARCH_CALL (cothread_stub);
+diff -urN gstreamer-0.8.10.orig/gst/gstarch.h gstreamer-0.8.10/gst/gstarch.h
+--- gstreamer-0.8.10.orig/gst/gstarch.h	2004-03-15 15:43:21.000000000 +0100
++++ gstreamer-0.8.10/gst/gstarch.h	2005-08-07 15:19:01.000000000 +0200
+@@ -38,7 +38,7 @@
+     __asm__("call *%0" : : "r"(target) );
+ 
+ /* assuming the stackframe is 16 bytes */
+-#define GST_ARCH_SETUP_STACK(sp) sp -= 4
++#define GST_ARCH_SETUP_STACK(sp) (sp) = (char *)(sp) - 4
+ 
+ 
+ 
diff --git a/media-libs/gstreamer/gstreamer-0.8.11.ebuild b/media-libs/gstreamer/gstreamer-0.8.11.ebuild
index d81c4dbb234a..b8730efa7455 100644
--- a/media-libs/gstreamer/gstreamer-0.8.11.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.8.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.8.11.ebuild,v 1.13 2006/10/14 21:08:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.8.11.ebuild,v 1.14 2007/02/15 14:49:50 gustavoz Exp $
 
 inherit eutils flag-o-matic libtool gnome2 flag-o-matic
 
@@ -35,6 +35,8 @@ src_unpack() {
 	# Fix doc generation with jade. See bug #55700.
 	epatch ${FILESDIR}/${PN}-0.8.3-jade_fix.patch
 
+	# gcc4 sparc fix, see http://bugzilla.gnome.org/show_bug.cgi?id=312812
+	use sparc && epatch ${FILESDIR}/cothreads-gcc4.patch
 }
 
 src_compile() {
diff --git a/media-libs/gstreamer/gstreamer-0.8.12.ebuild b/media-libs/gstreamer/gstreamer-0.8.12.ebuild
index e093f5d4a777..72c7216e4907 100644
--- a/media-libs/gstreamer/gstreamer-0.8.12.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.8.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.8.12.ebuild,v 1.4 2006/10/14 21:08:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.8.12.ebuild,v 1.5 2007/02/15 14:49:50 gustavoz Exp $
 
 inherit eutils flag-o-matic libtool gnome2 flag-o-matic
 
@@ -35,6 +35,8 @@ src_unpack() {
 	# Fix doc generation with jade. See bug #55700.
 	epatch ${FILESDIR}/${PN}-0.8.3-jade_fix.patch
 
+	# gcc4 sparc fix, see http://bugzilla.gnome.org/show_bug.cgi?id=312812
+	use sparc && epatch ${FILESDIR}/cothreads-gcc4.patch
 }
 
 src_compile() {