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

Package-Manager: portage-2.1.2-r9

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index dc16a4443b5e534a8268f513bdcfde67c4f78409..94a5609e3d68a460527a11487bcd3ea3592335a9 100644 (file)
--- 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/Manifest b/media-libs/gstreamer/Manifest
index 992d7432d4277c715936d9a808ce3c21ca5e258b..b42c1f86256fc9ba86d4a7316159f68fc6dc7cd1 100644 (file)
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cothreads-gcc4.patch 948 RMD160 4ed4b2bd36b5ec872203f7e8594fbf97c127c433 SHA1 d8732d5c4d0d0cc781f3b4e9abf4c2e1b07cc5b3 SHA256 3786e82174a1061845044054ffab75b993265295943b8796829e3b3ab46f75aa
+MD5 02f79e03f828f6b8dfa6288a8cabb52e files/cothreads-gcc4.patch 948
+RMD160 4ed4b2bd36b5ec872203f7e8594fbf97c127c433 files/cothreads-gcc4.patch 948
+SHA256 3786e82174a1061845044054ffab75b993265295943b8796829e3b3ab46f75aa files/cothreads-gcc4.patch 948
 AUX gstreamer-0.8.3-jade_fix.patch 1713 RMD160 e52cf7b4fb0e7d0a4043365dd1abaab5a121897f SHA1 e5bedff5c5a432391836f397a8a8524b959527f6 SHA256 852eb5828e8c5e270e8b32323e37dcf266308b5b5e5aa1f26d08bbb1be4fc51d
 MD5 465e9b8e2f33205128b7a69eca2e2c02 files/gstreamer-0.8.3-jade_fix.patch 1713
 RMD160 e52cf7b4fb0e7d0a4043365dd1abaab5a121897f files/gstreamer-0.8.3-jade_fix.patch 1713
@@ -17,18 +21,18 @@ EBUILD gstreamer-0.10.8.ebuild 1959 RMD160 9e399f7eb699cc924a220207d5cbc3eea4387
 MD5 8e690aaeed8ab5b36013acc0941474ee gstreamer-0.10.8.ebuild 1959
 RMD160 9e399f7eb699cc924a220207d5cbc3eea438739e gstreamer-0.10.8.ebuild 1959
 SHA256 8a57d341bf0490909f1536c8b42eb2b2c5fe1e4536ea289859364a1b235a4a47 gstreamer-0.10.8.ebuild 1959
-EBUILD gstreamer-0.8.11.ebuild 2830 RMD160 85891a1f3038ba4b243c955a42edc2f04055d509 SHA1 38ba6a92bf7bcfb537e964297fa8f003c49561bf SHA256 e428ee6252ec83cb7f2e78e49eb16ddb3d9e7241cece4ab747fa1275449df82e
-MD5 041399b35fc0dd28ca9b7e4f71e2bfec gstreamer-0.8.11.ebuild 2830
-RMD160 85891a1f3038ba4b243c955a42edc2f04055d509 gstreamer-0.8.11.ebuild 2830
-SHA256 e428ee6252ec83cb7f2e78e49eb16ddb3d9e7241cece4ab747fa1275449df82e gstreamer-0.8.11.ebuild 2830
-EBUILD gstreamer-0.8.12.ebuild 2839 RMD160 9deacbe187eceebd4a7b0836cd78cfe80a801ee7 SHA1 6a3bf147d8a8b5afcffd4d7b705db4a3d365054b SHA256 615f9502d70fcd27e1bc5eb7467f9267ad211f81e02229e67ba9e9c6c3a3ebc4
-MD5 3ec6872e14f953fabebbcba1966e7be5 gstreamer-0.8.12.ebuild 2839
-RMD160 9deacbe187eceebd4a7b0836cd78cfe80a801ee7 gstreamer-0.8.12.ebuild 2839
-SHA256 615f9502d70fcd27e1bc5eb7467f9267ad211f81e02229e67ba9e9c6c3a3ebc4 gstreamer-0.8.12.ebuild 2839
-MISC ChangeLog 22090 RMD160 b91b585d28c1fed404ae4fc0f3e33e93d116d72b SHA1 d202702ab32429c47831e8eb6a80a97ad7cdc43d SHA256 f4412cba70b7f74d268df73a273e977c170baacf872d3eee1fe3d033bffce679
-MD5 f7031737b197c77b8d20fd76a1785f4c ChangeLog 22090
-RMD160 b91b585d28c1fed404ae4fc0f3e33e93d116d72b ChangeLog 22090
-SHA256 f4412cba70b7f74d268df73a273e977c170baacf872d3eee1fe3d033bffce679 ChangeLog 22090
+EBUILD gstreamer-0.8.11.ebuild 2958 RMD160 06db0ef31cfcd60b35bab14062229728f1bf2aa2 SHA1 981551721d69edcdab3be6f7ccbba029b597da5a SHA256 efd42097bd77b32c532b64896a1b357d8e1057b0ba2fde3e11a73fd9804c17e8
+MD5 9aad8b3e4def65623360b7f94c9cbfa9 gstreamer-0.8.11.ebuild 2958
+RMD160 06db0ef31cfcd60b35bab14062229728f1bf2aa2 gstreamer-0.8.11.ebuild 2958
+SHA256 efd42097bd77b32c532b64896a1b357d8e1057b0ba2fde3e11a73fd9804c17e8 gstreamer-0.8.11.ebuild 2958
+EBUILD gstreamer-0.8.12.ebuild 2967 RMD160 ca6f0edeacfaf783e2968b7717d39925993c9379 SHA1 8bcc36a10207bb946256f6c4ee1246b17327d3b1 SHA256 ad5368e8dec8ecb95d550c8181437f9c6bd1faf56f3a837acd117194a12ff0f6
+MD5 3f64a97a6c1d7a81408375194f724136 gstreamer-0.8.12.ebuild 2967
+RMD160 ca6f0edeacfaf783e2968b7717d39925993c9379 gstreamer-0.8.12.ebuild 2967
+SHA256 ad5368e8dec8ecb95d550c8181437f9c6bd1faf56f3a837acd117194a12ff0f6 gstreamer-0.8.12.ebuild 2967
+MISC ChangeLog 22319 RMD160 0f66a32ac5dfa77f6e120bee3c13cf6ac619ae7c SHA1 31077d4dc2b5e700f180aedbb5d0a2c2a6cb8e30 SHA256 8ee0d8eace70e7ebab3ff29c536b66dac9e415a4b82c5d47e40793c901039e55
+MD5 8684af5de70f528915c10343b2352e89 ChangeLog 22319
+RMD160 0f66a32ac5dfa77f6e120bee3c13cf6ac619ae7c ChangeLog 22319
+SHA256 8ee0d8eace70e7ebab3ff29c536b66dac9e415a4b82c5d47e40793c901039e55 ChangeLog 22319
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -46,9 +50,9 @@ MD5 062722fbc74f0f6431b372c91cf1608d files/digest-gstreamer-0.8.12 256
 RMD160 b6e12e7eab140fb42f15214dc69722c2d8369d65 files/digest-gstreamer-0.8.12 256
 SHA256 43402db9eb58d3fe248dba023b0cbdd229b22421a9408c18b5b1e8fac2c6af2f files/digest-gstreamer-0.8.12 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
 
-iD8DBQFF0LwQNQqtfCuFneMRAq1uAJ4opHseJcfMXClLhEfntoTBLPp5zACggkQ4
-gCgdEIMKSOpUg3gOY/NbM/A=
-=C5Pu
+iD8DBQFF1HMZKRy60XGEcJIRAnZsAJ92BISpJjcmG9O7LbdO12eeL365wwCfcD7o
+JhMLDPVzIZ8DzPTI9+kZxAo=
+=YkYB
 -----END PGP SIGNATURE-----

diff --git a/media-libs/gstreamer/files/cothreads-gcc4.patch b/media-libs/gstreamer/files/cothreads-gcc4.patch
new file mode 100644 (file)
index 0000000..a9b37ed
--- /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 d81c4dbb234a17cf67f7d48566be08f716700b4d..b8730efa7455853daf43cca426492509647b62dc 100644 (file)
--- 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 e093f5d4a7777e901c1b7f7be7ab314650060a4d..72c7216e490740f55cc023c16ab7e3033d727275 100644 (file)
--- 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() {