PowerPC related fix

4 files changed, 49 insertions, 13 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index c42cf7731a78..2d40c1f19686 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/gstreamer
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.40 2003/10/23 21:56:11 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.41 2003/10/24 13:11:55 lu_zero Exp $
+
+  24 Oct 2003; Luca Barbato <lu_zero@gentoo.org> gstreamer-0.6.4.ebuild :
+  Added a ppc related patch
 
 *gstreamer-0.6.4 (23 Oct 2003)
 
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 1510a3405b8d..1dbfa9c6e609 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,16 +1,17 @@
-MD5 730edaef05d3315d12fe058ec7ac18c7 gstreamer-0.6.2.ebuild 1657
-MD5 630ada1c556d56b9fb18591330fd559e gstreamer-0.6.4.ebuild 1725
+MD5 3e232f10df832a03d01255c48123f922 ChangeLog 7134
 MD5 e5b7eb6c678fd17c99801420d22577de gstreamer-0.6.0-r2.ebuild 2225
 MD5 307f6dc1bbfe3b671121188670ef6640 gstreamer-0.6.1-r1.ebuild 1653
-MD5 6435c9bdc083223c438e1a0a1edd7db6 gstreamer-0.6.3.ebuild 2071
-MD5 b5850e59433cf9d5e3ab398815246ec5 ChangeLog 7029
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 2859a53d220f0d4f15d70265c0ae3ee2 files/digest-gstreamer-0.6.0-r2 69
+MD5 730edaef05d3315d12fe058ec7ac18c7 gstreamer-0.6.2.ebuild 1657
+MD5 6435c9bdc083223c438e1a0a1edd7db6 gstreamer-0.6.3.ebuild 2071
+MD5 9935ad2e7ed88c953c3591d6d2b41beb gstreamer-0.6.4.ebuild 1775
+MD5 108e4dae9d3c886119d0b0651d959feb files/digest-gstreamer-0.6.3 69
+MD5 25e847f18be30c70bf95d37afd5c82a4 files/digest-gstreamer-0.6.2 69
 MD5 d7d0bd22f575c14e4b5e9dae76109a13 files/digest-gstreamer-0.6.1-r1 69
+MD5 19da7f9f949dee117395e898c2e0bf39 files/gstreamer-0.6.0-sparc.patch 1428
+MD5 9a6a2ed73b08e3d33cb2c9d7cb1550ff files/gstreamer-0.6.3-gcc33.patch 557
+MD5 e373aed252b48ef567dbdda42e090c1f files/gnu_asm_fix.patch 953
+MD5 ff15475e2c782144d62016e6d37a99b4 files/digest-gstreamer-0.6.4 69
+MD5 2859a53d220f0d4f15d70265c0ae3ee2 files/digest-gstreamer-0.6.0-r2 69
 MD5 6bbd0426345ae753a9833575e160ad71 files/gstreamer-default_scheduler_opt.patch 2100
 MD5 a74f9b21ddb30cb0925e25cc18fc9213 files/gstreamer-error_report.patch 771
-MD5 25e847f18be30c70bf95d37afd5c82a4 files/digest-gstreamer-0.6.2 69
-MD5 108e4dae9d3c886119d0b0651d959feb files/digest-gstreamer-0.6.3 69
-MD5 ff15475e2c782144d62016e6d37a99b4 files/digest-gstreamer-0.6.4 69
-MD5 9a6a2ed73b08e3d33cb2c9d7cb1550ff files/gstreamer-0.6.3-gcc33.patch 557
-MD5 19da7f9f949dee117395e898c2e0bf39 files/gstreamer-0.6.0-sparc.patch 1428
diff --git a/media-libs/gstreamer/files/gnu_asm_fix.patch b/media-libs/gstreamer/files/gnu_asm_fix.patch
new file mode 100644
index 000000000000..21f4b4d230af
--- /dev/null
+++ b/media-libs/gstreamer/files/gnu_asm_fix.patch
@@ -0,0 +1,32 @@
+diff -ruN gstreamer-0.6.4.orig/gst/gstarch.h gstreamer-0.6.4/gst/gstarch.h
+--- gstreamer-0.6.4.orig/gst/gstarch.h	2003-10-24 14:26:01.000000000 +0200
++++ gstreamer-0.6.4/gst/gstarch.h	2003-10-24 14:27:32.000000000 +0200
+@@ -43,16 +43,26 @@
+ 
+ 
+ /***** PowerPC *****/
+-#elif defined (HAVE_CPU_PPC) && defined(__GNUC__)
++#elif defined (HAVE_CPU_PPC)
++#if defined(__GNUC__)
+ 
+ #define GST_ARCH_SET_SP(stackpointer) \
++    __asm__("lwz 1,%0" : : "m"(stackpointer) )
++  
++#define GST_ARCH_CALL(target) \
++    __asm__( "mr 0,%0\n\t" \
++             "mtlr 0\n\t" \
++             "blrl" : : "r"(target) : "r0" );
++#else
++#define GST_ARCH_SET_SP(stackpointer) \
+     __asm__("lwz r1,%0" : : "m"(stackpointer) )
+   
+ #define GST_ARCH_CALL(target) \
+     __asm__( "mr r0,%0\n\t" \
+              "mtlr r0\n\t" \
+              "blrl" : : "r"(target) : "r0" );
+-  
++#endif
++
+ struct minimal_ppc_stackframe {
+     unsigned long back_chain;
+     unsigned long LR_save;
diff --git a/media-libs/gstreamer/gstreamer-0.6.4.ebuild b/media-libs/gstreamer/gstreamer-0.6.4.ebuild
index af5d39f47804..176e2a8eb889 100644
--- a/media-libs/gstreamer/gstreamer-0.6.4.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.6.4.ebuild,v 1.1 2003/10/23 21:56:11 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.6.4.ebuild,v 1.2 2003/10/24 13:11:55 lu_zero Exp $
 
 inherit eutils flag-o-matic libtool gnome.org
 
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 
 	unpack ${A}
-
+	use ppc && epatch ${FILESDIR}/gnu_asm_fix.patch
 	# docs hack, disable dirs without html output
 	cd ${S}/docs
 	mv Makefile.in Makefile.in.old