summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarinus Schraal <foser@gentoo.org>2004-04-27 12:40:39 +0000
committerMarinus Schraal <foser@gentoo.org>2004-04-27 12:40:39 +0000
commit51c1583b3f3a54159ec75f539232992c9dbfc1e6 (patch)
tree1ab1f7913e4e0f185603acc6e572358973a2ea65 /media-libs/gstreamer
parentNew version (long overdue, sorry). Updated as requested in bug #40191 (Manife... (diff)
downloadgentoo-2-51c1583b3f3a54159ec75f539232992c9dbfc1e6.tar.gz
gentoo-2-51c1583b3f3a54159ec75f539232992c9dbfc1e6.tar.bz2
gentoo-2-51c1583b3f3a54159ec75f539232992c9dbfc1e6.zip
add gcc 3.4 patch
Diffstat (limited to 'media-libs/gstreamer')
-rw-r--r--media-libs/gstreamer/ChangeLog5
-rw-r--r--media-libs/gstreamer/files/gstreamer-0.8-unclobber_asm.patch37
-rw-r--r--media-libs/gstreamer/gstreamer-0.8.1.ebuild6
3 files changed, 46 insertions, 2 deletions
diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index 041e25c163a5..1edfcf4e74f2 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/gstreamer
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.54 2004/04/23 16:09:09 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.55 2004/04/27 12:40:39 foser Exp $
+
+ 27 Apr 2004; foser <foser@gentoo.org> gstreamer-0.8.1.ebuild :
+ Add patch to fix gcc 3.4 compilation (#48953)
*gstreamer-0.8.1 (23 Apr 2004)
diff --git a/media-libs/gstreamer/files/gstreamer-0.8-unclobber_asm.patch b/media-libs/gstreamer/files/gstreamer-0.8-unclobber_asm.patch
new file mode 100644
index 000000000000..2ad921194b5c
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-0.8-unclobber_asm.patch
@@ -0,0 +1,37 @@
+--- gst/gstcpu.c 2004/04/25 16:20:36 1.1
++++ gst/gstcpu.c 2004/04/25 16:21:05
+@@ -76,7 +76,7 @@
+ "=o" (regs[1]),
+ "=o" (regs[2]), "=o" (regs[3])
+ : "a" (x)
+-: "ebx", "ecx", "edx");
++: "ecx", "edx");
+
+ *eax = regs[0];
+ *ebx = regs[1];
+--- gst/gsttrashstack.h 2004/04/25 16:30:19 1.1
++++ gst/gsttrashstack.h 2004/04/25 16:40:43
+@@ -101,6 +101,7 @@
+ * inlikely that we manage to grab the wrong head->next value.
+ */
+ __asm__ __volatile__ (
++ " pushl %%ebx; \n\t"
+ " testl %%eax, %%eax; \n\t" /* if (head == NULL) return */
+ " jz 20f; \n\t"
+ "10: \n\t"
+@@ -110,12 +111,13 @@
+ SMP_LOCK "cmpxchg8b %1; \n\t" /* if eax:edx == *stack, move ebx:ecx to *stack,
+ * else *stack is moved into eax:edx again... */
+ " jnz 10b; \n\t" /* ... and we retry */
+- "20: \n"
++ "20: \n\t"
++ " popl %%ebx \n"
+ : "=a" (head)
+ : "m" (*stack),
+ "a" (stack->head),
+ "d" (stack->count)
+- : "ecx", "ebx"
++ : "ecx"
+ );
+
+ return head;
diff --git a/media-libs/gstreamer/gstreamer-0.8.1.ebuild b/media-libs/gstreamer/gstreamer-0.8.1.ebuild
index 6df08d9d9e43..32d666955df0 100644
--- a/media-libs/gstreamer/gstreamer-0.8.1.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.8.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.8.1.ebuild,v 1.2 2004/04/23 16:10:19 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.8.1.ebuild,v 1.3 2004/04/27 12:40:39 foser Exp $
# FIXME : re-enable docs build
inherit eutils flag-o-matic libtool gnome2
@@ -37,6 +37,10 @@ src_unpack() {
# mv Makefile.in Makefile.in.old
# sed -e "s:faq manual pwg::" Makefile.in.old > Makefile.in
+ cd ${S}
+ # gcc 3.4 fix
+ epatch ${FILESDIR}/${PN}-0.8-unclobber_asm.patch
+
}
src_compile() {