From 2d644940f561674d282d214b8e7c612145885bc3 Mon Sep 17 00:00:00 2001 From: Brandon Low Date: Fri, 25 Oct 2002 22:13:53 +0000 Subject: [PATCH] another patch from somewhere, should fix bug 9572 --- media-plugins/xmms-arts/ChangeLog | 12 +++-- .../xmms-arts/files/digest-xmms-arts-0.4-r6 | 1 + .../files/xmms-arts-0.4-gentoo2.patch | 27 +++++++++++ .../xmms-arts/xmms-arts-0.4-r6.ebuild | 48 +++++++++++++++++++ 4 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 media-plugins/xmms-arts/files/digest-xmms-arts-0.4-r6 create mode 100644 media-plugins/xmms-arts/files/xmms-arts-0.4-gentoo2.patch create mode 100644 media-plugins/xmms-arts/xmms-arts-0.4-r6.ebuild diff --git a/media-plugins/xmms-arts/ChangeLog b/media-plugins/xmms-arts/ChangeLog index 1120ea63ccd0..a44e8ac5122f 100644 --- a/media-plugins/xmms-arts/ChangeLog +++ b/media-plugins/xmms-arts/ChangeLog @@ -1,10 +1,16 @@ # 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.4 2002/10/25 18:47:08 lostlogic Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-arts/ChangeLog,v 1.5 2002/10/25 22:13:53 lostlogic Exp $ -*xmms-arts-0.4-r4 (15 Oct 2002) +*xmms-arts-0.4-r6 (25 Oct 2002) - 15 Oct 2002; Brandon Low xmms-arts-0.4-r4.ebuild: + 25 Oct 2002; Brandon Low xmms-arts-0.4-r6.ebuild: + + Add a missing include to the patches... + +*xmms-arts-0.4-r5 (25 Oct 2002) + + 25 Oct 2002; Brandon Low xmms-arts-0.4-r5.ebuild: Add patches from RedHat's SRPM for big endianness and nocmallocc thanks to Thomas Nilsson for poking me and diff --git a/media-plugins/xmms-arts/files/digest-xmms-arts-0.4-r6 b/media-plugins/xmms-arts/files/digest-xmms-arts-0.4-r6 new file mode 100644 index 000000000000..c9c2e8766e08 --- /dev/null +++ b/media-plugins/xmms-arts/files/digest-xmms-arts-0.4-r6 @@ -0,0 +1 @@ +MD5 0339aec5d67315da4a8242271cfc9f05 xmmsarts-0.4.tar.gz 114602 diff --git a/media-plugins/xmms-arts/files/xmms-arts-0.4-gentoo2.patch b/media-plugins/xmms-arts/files/xmms-arts-0.4-gentoo2.patch new file mode 100644 index 000000000000..cef6d9c9d7cb --- /dev/null +++ b/media-plugins/xmms-arts/files/xmms-arts-0.4-gentoo2.patch @@ -0,0 +1,27 @@ +diff -u xmms-arts-0.4/artsout.h xmms-arts-0.4.patched/artsout.h +--- xmms-arts-0.4/artsout.h 2000-09-01 05:35:06.000000000 +0200 ++++ xmms-arts-0.4.patched/artsout.h 2002-10-23 23:30:25.000000000 +0200 +@@ -38,6 +38,7 @@ + + #include + #include ++#include + + extern OutputPlugin op; + +diff -u xmms-arts-0.4/audio.c xmms-arts-0.4.patched/audio.c +--- xmms-arts-0.4/audio.c 2000-11-21 05:24:25.000000000 +0100 ++++ xmms-arts-0.4.patched/audio.c 2002-10-23 23:30:16.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-r6.ebuild b/media-plugins/xmms-arts/xmms-arts-0.4-r6.ebuild new file mode 100644 index 000000000000..903d5c0c87e3 --- /dev/null +++ b/media-plugins/xmms-arts/xmms-arts-0.4-r6.ebuild @@ -0,0 +1,48 @@ +# 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-r6.ebuild,v 1.1 2002/10/25 22:13:53 lostlogic Exp $ +inherit kde-base libtool + +# 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} + patch -p2 < ${FILESDIR}/${PN/-/}-${PV}-nocmallocc.patch || die "Failed patch" + cp Makefile.am Makefile.orig + sed -e "s:artsc-config:${KDEDIR}/bin/artsc-config:" \ + Makefile.orig > Makefile.am + patch -p1 < ${FILESDIR}/${P}-gentoo2.patch || die "Failed patch" + autoconf + patch -p1 < ${FILESDIR}/${P}-gentoo-endian.patch || die "Failed patch" +} + +src_compile() { + elibtoolize + + 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 +} + -- 2.26.2