add patch

5 files changed, 132 insertions, 2 deletions

diff --git a/media-libs/gstreamer/ChangeLog b/media-libs/gstreamer/ChangeLog
index 42aefcdcdcfa..45b6d7caedab 100644
--- a/media-libs/gstreamer/ChangeLog
+++ b/media-libs/gstreamer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/gstreamer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.92 2005/02/11 13:00:25 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/ChangeLog,v 1.93 2005/03/08 21:08:20 foser Exp $
+
+*gstreamer-0.8.9-r2 (08 Mar 2005)
+
+  08 Mar 2005; foser <foser@gentoo.org> gstreamer-0.8.9-r2.ebuild :
+  Add dataprotocol by zaheerm patch for bug which showed on 64 bit platforms
 
 *gstreamer-0.8.9-r1 (11 Feb 2005)
 
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 037004b000c9..c82ed930ca2d 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -5,11 +5,14 @@ MD5 c1a600f9c7419d5b41b50356a5210583 gstreamer-0.6.4.ebuild 1834
 MD5 5e025d896f851f83d6fb44b6658b74a4 gstreamer-0.8.5.ebuild 2191
 MD5 abf62d66d038341af9fd3f7baae1003a gstreamer-0.8.7.ebuild 2156
 MD5 898c7bf46170e72b9e6945a6401aebab gstreamer-0.8.3-r1.ebuild 2287
-MD5 fe660c5ca560d92595bc555475cc5781 ChangeLog 12661
+MD5 6f1c0340861bed0ad970748e211f5a73 gstreamer-0.8.9-r2.ebuild 2910
+MD5 7fcd4a06b119a3170c9a5098b781b2a3 ChangeLog 12842
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 d219e0115125181e4730a98f86ca463b files/digest-gstreamer-0.8.3-r1 69
 MD5 7f5ad30642cb2c0af9d64ac11c9dabb2 files/digest-gstreamer-0.8.9-r1 69
+MD5 7f5ad30642cb2c0af9d64ac11c9dabb2 files/digest-gstreamer-0.8.9-r2 69
 MD5 e74bc34fe33bd6c536feedd4ae91dcbc files/gstreamer-0.8-reiser4_register.patch 684
+MD5 eb396dce225d8cbcae77d8c7a60cae55 files/gstreamer-0.8.9-64_dataprotocol.patch 557
 MD5 c7cf43fd49b58741237224b5e48e188a files/gstreamer-0.8-unclobber_asm.patch 1164
 MD5 465e9b8e2f33205128b7a69eca2e2c02 files/gstreamer-0.8.3-jade_fix.patch 1713
 MD5 ff15475e2c782144d62016e6d37a99b4 files/digest-gstreamer-0.6.4 69
diff --git a/media-libs/gstreamer/files/digest-gstreamer-0.8.9-r2 b/media-libs/gstreamer/files/digest-gstreamer-0.8.9-r2
new file mode 100644
index 000000000000..242fc1b3b4e1
--- /dev/null
+++ b/media-libs/gstreamer/files/digest-gstreamer-0.8.9-r2
@@ -0,0 +1 @@
+MD5 6769de224de8457ed0dc09016287883a gstreamer-0.8.9.tar.bz2 1456548
diff --git a/media-libs/gstreamer/files/gstreamer-0.8.9-64_dataprotocol.patch b/media-libs/gstreamer/files/gstreamer-0.8.9-64_dataprotocol.patch
new file mode 100644
index 000000000000..cb08011cc3d8
--- /dev/null
+++ b/media-libs/gstreamer/files/gstreamer-0.8.9-64_dataprotocol.patch
@@ -0,0 +1,16 @@
+===================================================================
+RCS file: /cvs/gstreamer/gstreamer/libs/gst/dataprotocol/dataprotocol.c,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -r1.7 -r1.8
+--- dataprotocol.c	2004/10/01 16:49:01	1.7
++++ dataprotocol.c	2005/02/18 13:58:36	1.8
+@@ -83,7 +83,7 @@
+ {
+   int i;
+   int n = 8;                    /* number of bytes per line */
+-  gchar *line = g_malloc (3 * n);
++  gchar *line = g_malloc (3 * n + 1);
+ 
+   GST_LOG ("dumping byte array of length %d", length);
+   for (i = 0; i < length; ++i) {
diff --git a/media-libs/gstreamer/gstreamer-0.8.9-r2.ebuild b/media-libs/gstreamer/gstreamer-0.8.9-r2.ebuild
new file mode 100644
index 000000000000..1c5f02fb32d3
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-0.8.9-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.8.9-r2.ebuild,v 1.1 2005/03/08 21:08:20 foser Exp $
+
+inherit eutils flag-o-matic libtool gnome2 flag-o-matic
+
+# Create a major/minor combo for our SLOT and executables suffix
+PVP=(${PV//[-\._]/ })
+PV_MAJ_MIN=${PVP[0]}.${PVP[1]}
+
+DESCRIPTION="Streaming media framework"
+HOMEPAGE="http://gstreamer.sourceforge.net"
+SRC_URI="http://gstreamer.freedesktop.org/src/gstreamer/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT=${PV_MAJ_MIN}
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~arm"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2.2
+	>=dev-libs/libxml2-2.4.9
+	>=dev-libs/popt-1.6.3"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.11.5
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc
+		=app-text/docbook-xml-dtd-4.2* )"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# Fix doc generation with jade. See bug #55700.
+	epatch ${FILESDIR}/${PN}-0.8.3-jade_fix.patch
+	cd ${S}/libs/gst/dataprotocol
+	# fix dataprotocol bug
+	epatch ${FILESDIR}/${P}-64_dataprotocol.patch
+
+}
+
+src_compile() {
+
+	# FIXME : Ugly fix for docs generation gst cache problem (#57002)
+	use doc && addpredict /var && addpredict /root
+
+	elibtoolize
+
+	strip-flags
+	replace-flags "-O3" "-O2"
+	replace-flags "-Os" "-O2"
+
+	econf \
+		--with-configdir=/etc/gstreamer \
+		--disable-tests  \
+		--disable-examples \
+		`use_enable doc docs-build` \
+		|| die "./configure failed"
+
+	# On alpha, amd64 and hppa some innocuous warnings are spit out that break
+	# the build because of -Werror
+	use alpha && find . -name Makefile | xargs sed -i -e 's/-Werror//g'
+	use amd64 && find . -name Makefile | xargs sed -i -e 's/-Werror//g'
+	use hppa && find . -name Makefile | xargs sed -i -e 's/-Werror//g'
+
+	emake || die "compile failed"
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	# remove the unversioned binaries gstreamer provide
+	# this is to prevent these binaries to be owned by several SLOTs
+	cd ${D}/usr/bin
+	for gst_bins in `ls *-${PV_MAJ_MIN}`
+	do
+		rm ${gst_bins/-${PV_MAJ_MIN}/}
+		einfo "Removed ${gst_bins/-${PV_MAJ_MIN}/}"
+	done
+
+	cd ${S}
+	dodoc AUTHORS ChangeLog COPYING* DEVEL \
+		NEWS README RELEASE REQUIREMENTS TODO
+
+	dodir /etc/env.d/
+	echo "PRELINK_PATH_MASK=/usr/lib/${PN}-${PV_MAJ_MIN}" > ${D}/etc/env.d/60${PN}-${PV_MAJ_MIN}
+
+}
+
+pkg_postinst() {
+
+	gst-register-${PV_MAJ_MIN}
+
+	einfo "Gstreamer has known problems with prelinking, as a workaround"
+	einfo "this ebuild adds the gstreamer plugins to the prelink mask"
+	einfo "path to stop them from being prelinked. It is imperative"
+	einfo "that you undo & redo prelinking after building this pack for"
+	einfo "this to take effect. Make sure the gstreamer lib path is indeed"
+	einfo "added to the PRELINK_PATH_MASK environment variable."
+	einfo "For more information see http://bugs.gentoo.org/show_bug.cgi?id=81512"
+
+}