fixes segfault with ogg (and possibly other streams)

4 files changed, 67 insertions, 1 deletions

diff --git a/media-plugins/xmms-arts/ChangeLog b/media-plugins/xmms-arts/ChangeLog
index e7c611852b95..be8fdb6a68ce 100644
--- a/media-plugins/xmms-arts/ChangeLog
+++ b/media-plugins/xmms-arts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/xmms-arts
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-arts/ChangeLog,v 1.1 2002/08/30 08:35:31 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-arts/ChangeLog,v 1.2 2002/10/15 13:18:48 lostlogic Exp $
+
+*xmms-arts-0.4-r4 (15 Oct 2002)
+
+  15 Oct 2002; Brandon Low <lostlogic@gentoo.org> xmms-arts-0.4-r4.ebuild:
+
+  Added patch from BUG# 4314 thanks to Mauricio Lima Pilla, closing bug.
 
   30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> * :
 
diff --git a/media-plugins/xmms-arts/files/digest-xmms-arts-0.4-r4 b/media-plugins/xmms-arts/files/digest-xmms-arts-0.4-r4
new file mode 100644
index 000000000000..c9c2e8766e08
--- /dev/null
+++ b/media-plugins/xmms-arts/files/digest-xmms-arts-0.4-r4
@@ -0,0 +1 @@
+MD5 0339aec5d67315da4a8242271cfc9f05 xmmsarts-0.4.tar.gz 114602
diff --git a/media-plugins/xmms-arts/files/xmms-arts-0.4-gentoo.patch b/media-plugins/xmms-arts/files/xmms-arts-0.4-gentoo.patch
new file mode 100644
index 000000000000..6d2398920e48
--- /dev/null
+++ b/media-plugins/xmms-arts/files/xmms-arts-0.4-gentoo.patch
@@ -0,0 +1,15 @@
+--- xmms-arts-0.4-orig/audio.c  2000-11-21 05:24:25.000000000 +0100 
++++ xmms-arts-0.4-new/audio.c   2002-10-02 12:46:57.000000000 +0200 
+@@ -242,6 +242,12 @@ 
+ {
+ 	gint length, cnt;
+ 
++	int errorcode;
++	errorcode = arts_init();
++	if (errorcode < 0) {
++		fprintf(stderr,"arts_init error: %s\n", arts_error_text(errorcode));
++	pthread_exit(NULL);
++	}
+ 
+ 	while (going)
+ 	{
diff --git a/media-plugins/xmms-arts/xmms-arts-0.4-r4.ebuild b/media-plugins/xmms-arts/xmms-arts-0.4-r4.ebuild
new file mode 100644
index 000000000000..43861ee1c771
--- /dev/null
+++ b/media-plugins/xmms-arts/xmms-arts-0.4-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-arts/xmms-arts-0.4-r4.ebuild,v 1.1 2002/10/15 13:18:48 lostlogic Exp $
+inherit kde-base
+
+# Note: we set many vars e.g. DEPEND insteaed of extending them because this isn't a proper KDE app,
+# it only links against arts. So we need set-kdedir, but almost nothing else. So make sure it continues
+# to override e.g. src_install.
+
+DESCRIPTION="This output plugin allows xmms to work with arts, KDE's sound system"
+SRC_URI="http://stukach.com/hosted/m.i.a/xmmsarts/xmmsarts-0.4.tar.gz"
+# HOMEPAGE="http://home.earthlink.net/~bheath/xmms-arts/" #disappeared from the 'net?
+HOMEPAGE="http://www.xmms.org/plugins_output.html"
+
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+newdepend ">=media-sound/xmms-1.2.5-r1
+	    kde-base/arts"
+
+set-kdedir 3
+	 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp Makefile.am Makefile.orig
+	sed -e "s:artsc-config:${KDEDIR}/bin/artsc-config:" \
+		Makefile.orig > Makefile.am
+	patch -p1 < ${FILESDIR}/${P}-gentoo.patch || die "Failed patch"
+	autoconf
+}
+
+src_compile() {     
+	kde_src_compile myconf # calls set-kdedir
+	CFLAGS="$CFLAGS -I/usr/X11R6/include -I/usr/include -I${KDEDIR}/include -I${KDEDIR}/include/artsc"  
+	econf || die
+	emake || die
+}
+
+src_install() {                               
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING NEWS README
+}
+