Revision bump to fix bug #77220.

(Portage version: 2.0.51.21)

9 files changed, 62 insertions, 338 deletions

diff --git a/media-plugins/xmms-arts/ChangeLog b/media-plugins/xmms-arts/ChangeLog
index eb7db2dc7752..4750ca7d215c 100644
--- a/media-plugins/xmms-arts/ChangeLog
+++ b/media-plugins/xmms-arts/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/xmms-arts
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-arts/ChangeLog,v 1.30 2005/04/08 17:39:41 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-arts/ChangeLog,v 1.31 2005/05/04 22:11:02 eradicator Exp $
+
+*xmms-arts-0.7.1-r2 (04 May 2005)
+
+  04 May 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/xmms-arts-0.4-gentoo.patch,
+  -files/xmms-arts-0.4-gentoo-endian.patch,
+  -files/xmms-arts-0.4-gentoo2.patch, -files/xmmsarts-0.4-nocmallocc.patch,
+  +files/xmms-arts-0.7.1-eintr.patch, +xmms-arts-0.7.1-r2.ebuild:
+  Revision bump to fix bug #77220.
 
   08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   xmms-arts-0.7.1-r1.ebuild:
diff --git a/media-plugins/xmms-arts/Manifest b/media-plugins/xmms-arts/Manifest
index c9f3d69d3509..92dcc2c44098 100644
--- a/media-plugins/xmms-arts/Manifest
+++ b/media-plugins/xmms-arts/Manifest
@@ -1,8 +1,7 @@
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 825e851e1761455ddec9d575bbba96bd ChangeLog 4499
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 5ff8a455350ecdbcabf2ac43137f2d7d xmms-arts-0.7.1-r2.ebuild 859
 MD5 0c530a4cbd2a537c3f93c072352c6007 xmms-arts-0.7.1-r1.ebuild 757
-MD5 53dae4973af0651df719de36647891ae files/xmmsarts-0.4-nocmallocc.patch 1078
-MD5 8a92137732cf9165d7dc23ee3f0bb4df files/xmms-arts-0.4-gentoo-endian.patch 6410
-MD5 94aaa450cb287a73ebdb918f26d0db23 files/xmms-arts-0.4-gentoo2.patch 754
 MD5 30e324a6c8a02ad73d4b2c1d1603c96e files/digest-xmms-arts-0.7.1-r1 69
-MD5 4fde6a522e3bccd70269561fc287102d files/xmms-arts-0.4-gentoo.patch 372
+MD5 30e324a6c8a02ad73d4b2c1d1603c96e files/digest-xmms-arts-0.7.1-r2 69
+MD5 f8ccaa9e8988af808996d42f8d2f0ef9 files/xmms-arts-0.7.1-eintr.patch 377
diff --git a/media-plugins/xmms-arts/files/digest-xmms-arts-0.7.1-r2 b/media-plugins/xmms-arts/files/digest-xmms-arts-0.7.1-r2
new file mode 100644
index 000000000000..fdb70cc712b0
--- /dev/null
+++ b/media-plugins/xmms-arts/files/digest-xmms-arts-0.7.1-r2
@@ -0,0 +1 @@
+MD5 6d028255ed86e37211bbda0122c14483 arts_output-0.7.1.tar.gz 236839
diff --git a/media-plugins/xmms-arts/files/xmms-arts-0.4-gentoo-endian.patch b/media-plugins/xmms-arts/files/xmms-arts-0.4-gentoo-endian.patch
deleted file mode 100644
index de198e4a3374..000000000000
--- a/media-plugins/xmms-arts/files/xmms-arts-0.4-gentoo-endian.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-diff -Nru xmms-arts-0.4-clean/audio.c xmms-arts-0.4/audio.c
---- xmms-arts-0.4-clean/audio.c	2002-10-25 13:11:54.000000000 -0500
-+++ xmms-arts-0.4/audio.c	2002-10-25 13:13:11.000000000 -0500
-@@ -1,4 +1,4 @@
--/*      xmms - esound output plugin
-+/*      xmms - artsd output plugin
-  *    Copyright (C) 1999      Galex Yen
-  *
-  *      this program is free software
-@@ -11,11 +11,20 @@
-  *
-  *              Contains code Copyright (C) 1998-1999 Mikael Alm, Olle Hallnas,
-  *              Thomas Nillson and 4Front Technologies
-+ *
-+ * 
-+ *	    2002 Oct 13 Balint Cristian (rezso@rdsor.ro) 
-+ *				- fix 16 bit endianess
-+ *				- change topic to "artsd" instead "esd"
-+ *
-+ *
-+ *
-  */
- 
- #include "artsout.h"
- #include "config.h"
- 
-+
- static gpointer buffer;
- static gboolean going = FALSE, prebuffer, paused = FALSE, remove_prebuffer = FALSE;
- static gint buffer_size, prebuffer_size, blk_size = 4096;
-@@ -30,10 +39,72 @@
- static arts_stream_t stream = 0;
- static pthread_t buffer_thread;
- static gboolean realtime = FALSE;
-+static void *(*artsd_translate)(void *, gint);
-+int artsd_format;
-+
-+static void *artsd_stou8(void *data, gint length)
-+{
-+	int len = length;
-+	unsigned char *dat = (unsigned char *)data;
-+	while (len-- > 0)
-+		*dat++ ^= 0x80;
-+	return data;
-+}
-+
-+static void *artsd_utos16sw(void *data, gint length)
-+{
-+	int len = length;
-+	short *dat = data;
-+	while ( len > 0 ) {
-+		*dat = GUINT16_SWAP_LE_BE( *dat ) ^ 0x8000;
-+		dat++;
-+		len-=2;
-+	}
-+	return data;
-+}
-+static void *artsd_utos16(void *data, gint length)
-+{
-+	int len = length;
-+	short *dat = data;
-+	while ( len > 0 ) {
-+		*dat ^= 0x8000;
-+		dat++;
-+		len-=2;
-+	}
-+	return data;
-+}
-+static void *artsd_16sw(void *data, gint length)
-+{
-+	int len = length;
-+	short *dat = data;
-+	while ( len > 0 ) {
-+		*dat = GUINT16_SWAP_LE_BE( *dat );
-+		dat++;
-+		len-=2;
-+	}
-+	return data;
-+}
-+
-+static void *artsd_none(void *data, gint length)
-+{
-+	int len = length;
-+	short *dat = data;
-+	while ( len > 0 ) {
-+		*dat = *dat;
-+		dat++;
-+		len-=2;
-+	}
-+	return data;
-+}
-+
- 
- 
- static void artsd_setup_format(AFormat fmt,gint rate, gint nch)
- {
-+
-+	gboolean swap_sign = FALSE;
-+	gboolean swap_16 = FALSE;
-+
- 	format = fmt;
- 	frequency = rate;
- 	channels = nch;
-@@ -41,14 +112,16 @@
- 	latency = arts_stream_get(stream,ARTS_P_SERVER_LATENCY)  * frequency / 44100 * channels;
- 
- 	switch(fmt) {
--	        case FMT_U8:
--		case FMT_S8:
-+	        case FMT_S8:
-+			swap_sign = TRUE;
-+		case FMT_U8:
- 			latency *= 2;
- 			sample_width = 8;
- 			break;
- 		case FMT_U16_LE:
- 		case FMT_U16_BE:
- 		case FMT_U16_NE:
-+			swap_sign = TRUE;
- 		case FMT_S16_LE:
- 		case FMT_S16_BE:
- 		case FMT_S16_NE:
-@@ -56,8 +129,19 @@
- 			bps *= 2;
- 			break;
- 	}
--}
- 
-+if (sample_width == 16)
-+
-+#ifdef WORDS_BIGENDIAN
-+	    artsd_translate = artsd_16sw;
-+#else
-+	    artsd_translate = artsd_none;
-+#endif
-+
-+else
-+	    artsd_translate = artsd_none;
-+
-+} 
- 
- gint artsd_get_written_time(void)
- {
-@@ -158,11 +242,12 @@
- 	if(effects_enabled() && ep && ep->mod_samples)
- 		length = ep->mod_samples(&data,length, input_format, input_frequency, input_channels);
- 
--	errorcode = arts_write(stream,data,length);
-+	errorcode = arts_write(stream,artsd_translate(data,length),length);
- 	if(errorcode < 0)
- 		fprintf(stderr,"arts_write error: %s\n",arts_error_text(errorcode));
--	else
-+	else	
-   		output_bytes += errorcode;
-+	
- }
- 
- 
-diff -Nru xmms-arts-0.4-clean/configure xmms-arts-0.4/configure
---- xmms-arts-0.4-clean/configure	2002-10-25 13:11:56.000000000 -0500
-+++ xmms-arts-0.4/configure	2002-10-25 13:12:43.000000000 -0500
-@@ -2434,6 +2434,95 @@
- echo "${ECHO_T}no, using $LN_S" >&6
- fi
- 
-+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-+echo "configure:1409: checking whether byte ordering is bigendian" >&5
-+if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_cv_c_bigendian=unknown
-+# See if sys/param.h defines the BYTE_ORDER macro.
-+cat > conftest.$ac_ext <<EOF
-+#line 1416 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+#include <sys/param.h>
-+int main() {
-+
-+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
-+ bogus endian macros
-+#endif
-+; return 0; }
-+EOF
-+if { (eval echo configure:1427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  # It does; now see whether it defined to BIG_ENDIAN or not.
-+cat > conftest.$ac_ext <<EOF
-+#line 1431 "configure"
-+#include "confdefs.h"
-+#include <sys/types.h>
-+#include <sys/param.h>
-+int main() {
-+
-+#if BYTE_ORDER != BIG_ENDIAN
-+ not big endian
-+#endif
-+; return 0; }
-+EOF
-+if { (eval echo configure:1442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ac_cv_c_bigendian=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_c_bigendian=no
-+fi
-+rm -f conftest*
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+if test $ac_cv_c_bigendian = unknown; then
-+if test "$cross_compiling" = yes; then
-+    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1462 "configure"
-+#include "confdefs.h"
-+main () {
-+  /* Are we little or big endian?  From Harbison&Steele.  */
-+  union
-+  {
-+    long l;
-+    char c[sizeof (long)];
-+  } u;
-+  u.l = 1;
-+  exit (u.c[sizeof (long) - 1] == 1);
-+}
-+EOF
-+if { (eval echo configure:1475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+then
-+  ac_cv_c_bigendian=no
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -fr conftest*
-+  ac_cv_c_bigendian=yes
-+fi
-+rm -fr conftest*
-+fi
-+
-+fi
-+fi
-+
-+echo "$ac_t""$ac_cv_c_bigendian" 1>&6
-+if test $ac_cv_c_bigendian = yes; then
-+  cat >> confdefs.h <<\EOF
-+#define WORDS_BIGENDIAN 1
-+EOF
-+
-+fi
- 
- 
- # Check for any special flags to pass to ltconfig.
-diff -Nru xmms-arts-0.4-clean/configure.in xmms-arts-0.4/configure.in
---- xmms-arts-0.4-clean/configure.in	2000-11-20 22:30:00.000000000 -0600
-+++ xmms-arts-0.4/configure.in	2002-10-25 13:12:58.000000000 -0500
-@@ -15,6 +15,7 @@
- dnl Checks for header files.
- AC_STDC_HEADERS
- AC_CHECK_HEADERS(fcntl.h sys/time.h)
-+AC_C_BIGENDIAN
- 
- dnl Checks for Gtk+
- AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR([*** GLIB >= 1.2.0 not installed - please install first ***]))
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
deleted file mode 100644
index 6d2398920e48..000000000000
--- a/media-plugins/xmms-arts/files/xmms-arts-0.4-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/files/xmms-arts-0.4-gentoo2.patch b/media-plugins/xmms-arts/files/xmms-arts-0.4-gentoo2.patch
deleted file mode 100644
index cef6d9c9d7cb..000000000000
--- a/media-plugins/xmms-arts/files/xmms-arts-0.4-gentoo2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 <xmms/plugin.h>
- #include <xmms/configfile.h>
-+#include <xmms/util.h>
- 
- 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/files/xmms-arts-0.7.1-eintr.patch b/media-plugins/xmms-arts/files/xmms-arts-0.7.1-eintr.patch
new file mode 100644
index 000000000000..96a28d5a6928
--- /dev/null
+++ b/media-plugins/xmms-arts/files/xmms-arts-0.7.1-eintr.patch
@@ -0,0 +1,15 @@
+--- audio.c.old	2005-01-09 13:32:09.629042808 +0100
++++ audio.c	2005-01-09 13:32:59.646439008 +0100
+@@ -86,8 +86,12 @@
+ 	timeout.tv_sec = 10;
+ 	timeout.tv_usec = 0;
+ 
++again:
+ 	sr = select(fd + 1, &rdfs, NULL, NULL, &timeout);
+ 	if (sr < 0) {
++		if(errno==EINTR) {
++			goto again;
++		}
+ 		g_message("wait_for_helper(): select failed: %s",
+ 			  strerror(errno));
+ 		return -1;
diff --git a/media-plugins/xmms-arts/files/xmmsarts-0.4-nocmallocc.patch b/media-plugins/xmms-arts/files/xmmsarts-0.4-nocmallocc.patch
deleted file mode 100644
index acfdbe7d731b..000000000000
--- a/media-plugins/xmms-arts/files/xmmsarts-0.4-nocmallocc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- xmms-1.2.4/xmms-arts-0.4/Makefile.am.build	Mon Jan  8 15:52:12 2001
-+++ xmms-1.2.4/xmms-arts-0.4/Makefile.am	Mon Jan  8 15:52:26 2001
-@@ -1,7 +1,7 @@
- lib_LTLIBRARIES = libartsout.la
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ `artsc-config --cflags`
- LIBS = @LIBS@ @GTK_LIBS@ @PTHREAD_LIBS@
--libartsout_la_LDFLAGS = `artsc-config --libs` -lcmallocc
-+libartsout_la_LDFLAGS = `artsc-config --libs`
- libartsout_la_SOURCES = about.c artsout.c artsout.h audio.c configure.c init.c mixer.c
- libdir = $(xmms_output_plugin_dir)
- XMMSPATH = $(XMMS_PATH)
---- xmms-1.2.4/xmms-arts-0.4/Makefile.in.build	Mon Jan  8 15:52:17 2001
-+++ xmms-1.2.4/xmms-arts-0.4/Makefile.in	Mon Jan  8 15:52:33 2001
-@@ -83,7 +83,7 @@
- lib_LTLIBRARIES = libartsout.la
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ `artsc-config --cflags`
- LIBS = @LIBS@ @GTK_LIBS@ @PTHREAD_LIBS@
--libartsout_la_LDFLAGS = `artsc-config --libs` -lcmallocc
-+libartsout_la_LDFLAGS = `artsc-config --libs`
- libartsout_la_SOURCES = about.c artsout.c artsout.h audio.c configure.c init.c mixer.c
- libdir = $(xmms_output_plugin_dir)
- XMMSPATH = $(XMMS_PATH)
diff --git a/media-plugins/xmms-arts/xmms-arts-0.7.1-r2.ebuild b/media-plugins/xmms-arts/xmms-arts-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..231d37b2cfac
--- /dev/null
+++ b/media-plugins/xmms-arts/xmms-arts-0.7.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-arts/xmms-arts-0.7.1-r2.ebuild,v 1.5 2005/05/04 22:11:02 eradicator Exp $
+
+inherit eutils
+
+MY_P=arts_output-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="This output plugin allows xmms to work with arts, KDE's sound system"
+HOMEPAGE="http://www.xmms.org/plugins.php"
+SRC_URI="http://havardk.xmms.org/plugins/arts_output/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=media-sound/xmms-1.2.7
+	kde-base/arts"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-eintr.patch
+}
+
+src_install() {
+	make DESTDIR=${D} libdir=`xmms-config --output-plugin-dir` install || die
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+}