summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorben <ben>2004-02-12 05:59:21 +0000
committerben <ben>2004-02-12 05:59:21 +0000
commitfe795e55be0b9eb193bc51dfd59229e061559818 (patch)
tree07469236b2c406637aa5c631852321ae5cc88e15 /audio
parentdd4268233f5aa45ed70aeb7d61f0c2c9717bda1b (diff)
downloadpkgsrc-fe795e55be0b9eb193bc51dfd59229e061559818.tar.gz
Make xmms-meta-input build in NetBSD 1.6, specifically stop colliding with
pause in unistd.h, and give setpgrp() arguments.
Diffstat (limited to 'audio')
-rw-r--r--audio/xmms-meta-input/distinfo4
-rw-r--r--audio/xmms-meta-input/patches/patch-ab36
2 files changed, 35 insertions, 5 deletions
diff --git a/audio/xmms-meta-input/distinfo b/audio/xmms-meta-input/distinfo
index b899156d793..077b8c6eba9 100644
--- a/audio/xmms-meta-input/distinfo
+++ b/audio/xmms-meta-input/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/24 00:09:55 ben Exp $
+$NetBSD: distinfo,v 1.2 2004/02/12 05:59:21 ben Exp $
SHA1 (xmms-meta-input-0.4.tar.gz) = 46d3644ca51b21b6756b305068aeb54125c44768
Size (xmms-meta-input-0.4.tar.gz) = 14653 bytes
SHA1 (patch-aa) = 25f9a00942c7b8bb4056d5aafeecc903a931b357
-SHA1 (patch-ab) = bb8f380b1d6684cd1d7f601ac0224a5e61f52a2f
+SHA1 (patch-ab) = ad8246f2b882c981d7d6f77b29d76d64d2c40ae0
diff --git a/audio/xmms-meta-input/patches/patch-ab b/audio/xmms-meta-input/patches/patch-ab
index 2e58f145655..b3af95528a6 100644
--- a/audio/xmms-meta-input/patches/patch-ab
+++ b/audio/xmms-meta-input/patches/patch-ab
@@ -1,10 +1,40 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/12/24 00:09:55 ben Exp $
+$NetBSD: patch-ab,v 1.2 2004/02/12 05:59:21 ben Exp $
--- meta-input.c.orig 2002-05-02 08:29:12.000000000 -0700
+++ meta-input.c
-@@ -411,7 +411,8 @@ static void stop (void)
+@@ -53,7 +53,7 @@ static int is_our_file (char *filename);
+ static void *play_loop(void *arg);
+ static void play (char *filename);
+ static void stop (void);
+-static void pause (short p);
++static void do_pause (short p);
+ static int get_time (void);
+ static void get_song_info (char *filename, char **title_real, int *len_real);
+ static void seek (int sec);
+@@ -75,7 +75,7 @@ InputPlugin meta_input_ip =
+ NULL,
+ play,
+ stop,
+- pause,
++ do_pause,
+ seek,
+ NULL,
+ get_time,
+@@ -327,7 +327,7 @@ static void play (char *filename)
+ if (ret == 0) // Child process
+ {
+ // Set group ID for easy killing of the player later...
+- setpgrp();
++ setpgrp(0, getpid());
+
+ close (filedes [0]);
+ close (0);
+@@ -409,9 +409,10 @@ static void stop (void)
+ }
+ }
- static void pause (short p)
+-static void pause (short p)
++static void do_pause (short p)
{
- meta_input_ip.output->pause (p);
+ /* for some reason this coredumps for me -Ben */