stable on ia64

4 files changed, 87 insertions, 14 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index 2043d0232583..ac7dccf9ae63 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +1,10 @@
 # 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.42 2003/11/08 16:14:38 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.43 2003/11/14 22:41:18 agriffis Exp $
+
+  14 Nov 2003; Aron Griffis <agriffis@gentoo.org> gstreamer-0.6.3.ebuild,
+  files/gstreamer-0.6.3-Werror.patch:
+  Mark stable on ia64
 
   08 Nov 2003; Todd Sunderlin <todd@gentoo.org> gstreamer-0.6.3.ebuild:
   added sparc keyword
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 99225ec6b9b7..a904d050cd58 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,17 +1,18 @@
-MD5 f0dce48f1df8b9104eb4f7e03c1d1776 ChangeLog 7225
-MD5 fc1116e09d44a6f53fae6b4bea7ee3e4 gstreamer-0.6.0-r2.ebuild 2224
-MD5 9f3f1522e5735516713121723901b0b0 gstreamer-0.6.1-r1.ebuild 1652
-MD5 e5c4625c1c33b378d5ffa23de8551552 gstreamer-0.6.2.ebuild 1656
-MD5 d41ad63ccd14516843ad99624e77de52 gstreamer-0.6.3.ebuild 2062
+MD5 6ab677abb676562239e9aa6218bece2d ChangeLog 7365
+MD5 af8b856d730bc47f1af4b158b3c1ca3b gstreamer-0.6.3.ebuild 2183
+MD5 307f6dc1bbfe3b671121188670ef6640 gstreamer-0.6.1-r1.ebuild 1653
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 419c5b80bfca1e963ef9599444f70ca7 gstreamer-0.6.4.ebuild 1774
-MD5 2859a53d220f0d4f15d70265c0ae3ee2 files/digest-gstreamer-0.6.0-r2 69
-MD5 d7d0bd22f575c14e4b5e9dae76109a13 files/digest-gstreamer-0.6.1-r1 69
-MD5 25e847f18be30c70bf95d37afd5c82a4 files/digest-gstreamer-0.6.2 69
+MD5 e5b7eb6c678fd17c99801420d22577de gstreamer-0.6.0-r2.ebuild 2225
+MD5 730edaef05d3315d12fe058ec7ac18c7 gstreamer-0.6.2.ebuild 1657
+MD5 9935ad2e7ed88c953c3591d6d2b41beb gstreamer-0.6.4.ebuild 1775
 MD5 108e4dae9d3c886119d0b0651d959feb files/digest-gstreamer-0.6.3 69
 MD5 19da7f9f949dee117395e898c2e0bf39 files/gstreamer-0.6.0-sparc.patch 1428
+MD5 25e847f18be30c70bf95d37afd5c82a4 files/digest-gstreamer-0.6.2 69
+MD5 d7d0bd22f575c14e4b5e9dae76109a13 files/digest-gstreamer-0.6.1-r1 69
 MD5 9a6a2ed73b08e3d33cb2c9d7cb1550ff files/gstreamer-0.6.3-gcc33.patch 557
-MD5 6bbd0426345ae753a9833575e160ad71 files/gstreamer-default_scheduler_opt.patch 2100
-MD5 a74f9b21ddb30cb0925e25cc18fc9213 files/gstreamer-error_report.patch 771
 MD5 ff15475e2c782144d62016e6d37a99b4 files/digest-gstreamer-0.6.4 69
 MD5 e373aed252b48ef567dbdda42e090c1f files/gnu_asm_fix.patch 953
+MD5 5705a7d2ff6278dbf1f51b8241ff5474 files/gstreamer-0.6.3-Werror.patch 2576
+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
diff --git a/media-libs/gstreamer/files/gstreamer-0.6.3-Werror.patch b/media-libs/gstreamer/files/gstreamer-0.6.3-Werror.patch
new file mode 100644
index 000000000000..ea904eb7f2dc
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-0.6.3-Werror.patch
@@ -0,0 +1,63 @@
+gstreamer is built with -Werror.  However on platforms that don't have
+architecture specific implementations of the atomic functions, this
+code would cause the compile to fail, so comment out the line.  This
+is particularly important at the moment on IA-64.
+					      -- agriffis, 13 Nov 2003
+
+--- gstreamer-0.6.3/gst/gstatomic_impl.h.old	2003-08-03 16:52:19.000000000 -0400
++++ gstreamer-0.6.3/gst/gstatomic_impl.h	2003-11-13 14:43:34.000000000 -0500
+@@ -415,7 +415,7 @@
+ }
+ 
+ #else 
+-#warning consider putting your architecture specific atomic implementations here
++//#warning consider putting your architecture specific atomic implementations here
+ 
+ /*
+  * generic implementation
+--- gstreamer-0.6.3/gst/elements/gstfilesrc.c.old	2003-11-14 13:41:30.000000000 -0500
++++ gstreamer-0.6.3/gst/elements/gstfilesrc.c	2003-11-14 14:28:12.000000000 -0500
+@@ -396,8 +396,8 @@
+     return NULL;
+   }
+   else if (mmapregion == MAP_FAILED) {
+-    GST_DEBUG (0, "mmap (0x%x, %d, 0x%llx) : %s",
+- 	     size, src->fd, offset, strerror (errno));
++    GST_DEBUG (0, "mmap (0x%lx, %ld, %d, 0x%llx) : %s",
++ 	     (unsigned long)NULL, size, src->fd, offset, strerror (errno));
+     return NULL;
+   }
+   GST_DEBUG (0, "mapped region %08lx+%08lx from file into memory at %p", 
+@@ -667,8 +667,7 @@
+ 
+   /* check for EOF */
+   if (src->curoffset == src->filelen) {
+-    GST_DEBUG (0, "filesrc eos %" G_GINT64_FORMAT
+-		  " %" G_GINT64_FORMAT, src->curoffset, src->filelen);
++    GST_DEBUG (0, "filesrc eos %llx %lld", src->curoffset, src->filelen);
+     gst_element_set_eos (GST_ELEMENT (src));
+     return GST_BUFFER (gst_event_new (GST_EVENT_EOS));
+   }
+@@ -836,19 +835,19 @@
+           if (offset > src->filelen) 
+ 	    goto error;
+           src->curoffset = offset;
+-          GST_DEBUG(0, "seek set pending to %" G_GINT64_FORMAT, src->curoffset);
++          GST_DEBUG(0, "seek set pending to %llx", src->curoffset);
+ 	  break;
+         case GST_SEEK_METHOD_CUR:
+           if (offset + src->curoffset > src->filelen) 
+ 	    goto error;
+           src->curoffset += offset;
+-          GST_DEBUG(0, "seek cur pending to %" G_GINT64_FORMAT, src->curoffset);
++          GST_DEBUG(0, "seek cur pending to %llx", src->curoffset);
+ 	  break;
+         case GST_SEEK_METHOD_END:
+           if (ABS (offset) > src->filelen) 
+ 	    goto error;
+           src->curoffset = src->filelen - ABS (offset);
+-          GST_DEBUG(0, "seek end pending to %" G_GINT64_FORMAT, src->curoffset);
++          GST_DEBUG(0, "seek end pending to %llx", src->curoffset);
+ 	  break;
+ 	default:
+           goto error;
diff --git a/media-libs/gstreamer/gstreamer-0.6.3.ebuild b/media-libs/gstreamer/gstreamer-0.6.3.ebuild
index 3fd17a5383a3..9d3ee5fc7c2d 100644
--- a/media-libs/gstreamer/gstreamer-0.6.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-0.6.3.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.3.ebuild,v 1.12 2003/11/08 16:14:38 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.6.3.ebuild,v 1.13 2003/11/14 22:41:18 agriffis Exp $
 
 inherit eutils flag-o-matic libtool gnome.org
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://gstreamer.sourceforge.net"
 
 SLOT=${PV_MAJ_MIN}
 LICENSE="LGPL-2"
-KEYWORDS="x86 ppc sparc alpha amd64"
+KEYWORDS="x86 ppc sparc alpha amd64 ia64"
 
 RDEPEND=">=dev-libs/glib-2.0.4
 	>=dev-libs/libxml2-2.4
@@ -35,6 +35,11 @@ src_unpack() {
 	# proper gcc 3.3.1 fix (#27077)
 	epatch ${FILESDIR}/${P}-gcc33.patch
 
+	# patches to build with -Werror on ia64
+	if use ia64; then
+		epatch ${FILESDIR}/${PN}-0.6.3-Werror.patch
+	fi
+
 }
 
 src_compile() {