diff options
author | markd <markd@pkgsrc.org> | 2004-12-01 11:47:44 +0000 |
---|---|---|
committer | markd <markd@pkgsrc.org> | 2004-12-01 11:47:44 +0000 |
commit | 1763085ffe62dc7157d7acaed9933c88aaf44930 (patch) | |
tree | bf67f836d34d9c679dc7a98003604975bf7a0f5c | |
parent | a382c98038c74802598e25e6c4bd4e0295b7c4ea (diff) | |
download | pkgsrc-1763085ffe62dc7157d7acaed9933c88aaf44930.tar.gz |
Update to xmms-arts 0.7.1
Major change is that it works with arts >= 1.2 by using an external
helper program.
Also take Maintainership - ok'ed by jmmv.
-rw-r--r-- | audio/xmms-arts/Makefile | 13 | ||||
-rw-r--r-- | audio/xmms-arts/PLIST | 5 | ||||
-rw-r--r-- | audio/xmms-arts/distinfo | 8 | ||||
-rw-r--r-- | audio/xmms-arts/patches/patch-aa | 13 | ||||
-rw-r--r-- | audio/xmms-arts/patches/patch-ab | 28 |
5 files changed, 40 insertions, 27 deletions
diff --git a/audio/xmms-arts/Makefile b/audio/xmms-arts/Makefile index 983307c1b92..4f3ec991438 100644 --- a/audio/xmms-arts/Makefile +++ b/audio/xmms-arts/Makefile @@ -1,18 +1,15 @@ -# $NetBSD: Makefile,v 1.7 2004/10/03 00:13:10 tv Exp $ +# $NetBSD: Makefile,v 1.8 2004/12/01 11:47:44 markd Exp $ # -DISTNAME= xmmsarts-0.4 -PKGNAME= ${DISTNAME:S/xmms/xmms-/} -PKGREVISION= 2 +DISTNAME= arts_output-0.7.1 +PKGNAME= xmms-arts-0.7.1 CATEGORIES= audio kde -MASTER_SITES= http://stukach.com/hosted/m.i.a/xmmsarts/ -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= http://havardk.xmms.org/plugins/arts_output/ -MAINTAINER= jmmv@NetBSD.org +MAINTAINER= markd@NetBSD.org HOMEPAGE= http://www.xmms.org/plugins.php?category=output COMMENT= XMMS plugin to output sound through the aRts sound daemon -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= yes USE_BUILDLINK3= yes USE_LIBTOOL= yes diff --git a/audio/xmms-arts/PLIST b/audio/xmms-arts/PLIST index 1ea07317e74..2a3c8c2172f 100644 --- a/audio/xmms-arts/PLIST +++ b/audio/xmms-arts/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:18 jlam Exp $ -lib/xmms/Output/libartsout.la +@comment $NetBSD: PLIST,v 1.3 2004/12/01 11:47:44 markd Exp $ +bin/xmms-arts-helper +lib/xmms/Output/libarts.la @comment in xmms: @dirrm lib/xmms/Output diff --git a/audio/xmms-arts/distinfo b/audio/xmms-arts/distinfo index f972390359f..8314c6efe48 100644 --- a/audio/xmms-arts/distinfo +++ b/audio/xmms-arts/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/07/24 14:25:35 jmmv Exp $ +$NetBSD: distinfo,v 1.2 2004/12/01 11:47:44 markd Exp $ -SHA1 (xmmsarts-0.4.tar.bz2) = f8f02efcc3826cc086bdb5c2279c793dae695966 -Size (xmmsarts-0.4.tar.bz2) = 94742 bytes -SHA1 (patch-aa) = 0a1947aec7bf6d8868f5ec415e31a6cda0c33413 +SHA1 (arts_output-0.7.1.tar.gz) = 026b7b0be459cfff75557c04e54425c4d21dacaf +Size (arts_output-0.7.1.tar.gz) = 236839 bytes +SHA1 (patch-ab) = b5205b675f9db35d1035a68d4e01f9473322c39d diff --git a/audio/xmms-arts/patches/patch-aa b/audio/xmms-arts/patches/patch-aa deleted file mode 100644 index cefbb287149..00000000000 --- a/audio/xmms-arts/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/07/24 14:25:36 jmmv Exp $ - ---- Makefile.in.orig 2003-07-19 20:18:27.000000000 +0200 -+++ Makefile.in -@@ -83,7 +83,7 @@ xmms_output_plugin_dir = @xmms_output_pl - 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/audio/xmms-arts/patches/patch-ab b/audio/xmms-arts/patches/patch-ab new file mode 100644 index 00000000000..34a1113a04f --- /dev/null +++ b/audio/xmms-arts/patches/patch-ab @@ -0,0 +1,28 @@ +$NetBSD: patch-ab,v 1.1 2004/12/01 11:47:45 markd Exp $ + +--- arts_helper.c.orig 2004-11-29 15:01:44.000000000 +1300 ++++ arts_helper.c 2004-11-29 15:02:12.000000000 +1300 +@@ -15,6 +15,7 @@ + #include <errno.h> + #include <signal.h> + #include <sys/select.h> ++#include <sys/time.h> + + #include <artsc.h> + +@@ -243,7 +244,7 @@ + { + going = 0; + arts_close_stream(handle); +- arts_free(); ++ /* arts_free(); */ + } + + static int read_all(int fd, void *buf, size_t count) +@@ -439,5 +440,5 @@ + ret = main_loop(fd); + close(fd); + /* fprintf(stderr, "helper exits\n"); */ +- return ret < 0; ++ exit(ret < 0); + } |