diff options
author | abs <abs> | 2002-08-02 23:01:45 +0000 |
---|---|---|
committer | abs <abs> | 2002-08-02 23:01:45 +0000 |
commit | b6cd3914209223e9bbdfcadee0df68ae720dae03 (patch) | |
tree | 62490c5a0af1a172a7bea68403c2545cc1540de1 /audio | |
parent | cffacadbbce26d7969369f16bc15631e9341bee2 (diff) | |
download | pkgsrc-b6cd3914209223e9bbdfcadee0df68ae720dae03.tar.gz |
Updated mserv to 0.33nb4:
Ensure reset message is flushed before restart starts, and fix volume
control to correctly report new value so 'volume -' and 'volume +'
will always reduce/increase the volume by the minimum value.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/mserv/Makefile | 4 | ||||
-rw-r--r-- | audio/mserv/distinfo | 11 | ||||
-rw-r--r-- | audio/mserv/patches/patch-aa | 2 | ||||
-rw-r--r-- | audio/mserv/patches/patch-ab | 11 | ||||
-rw-r--r-- | audio/mserv/patches/patch-ac | 2 | ||||
-rw-r--r-- | audio/mserv/patches/patch-ad | 2 | ||||
-rw-r--r-- | audio/mserv/patches/patch-ae | 2 | ||||
-rw-r--r-- | audio/mserv/patches/patch-af | 2 | ||||
-rw-r--r-- | audio/mserv/patches/patch-ag | 2 | ||||
-rw-r--r-- | audio/mserv/patches/patch-ah | 4 | ||||
-rw-r--r-- | audio/mserv/patches/patch-ai | 32 | ||||
-rw-r--r-- | audio/mserv/patches/patch-aj | 28 | ||||
-rw-r--r-- | audio/mserv/patches/patch-ak | 15 |
13 files changed, 69 insertions, 48 deletions
diff --git a/audio/mserv/Makefile b/audio/mserv/Makefile index e2cb8959d04..137d4df17cf 100644 --- a/audio/mserv/Makefile +++ b/audio/mserv/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2002/07/31 14:02:44 abs Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/02 23:01:45 abs Exp $ # DISTNAME= mserv-0.33 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= audio MASTER_SITES= http://www.mserv.org/download/ diff --git a/audio/mserv/distinfo b/audio/mserv/distinfo index e2c6eedf2b9..68798fa1227 100644 --- a/audio/mserv/distinfo +++ b/audio/mserv/distinfo @@ -1,14 +1,15 @@ -$NetBSD: distinfo,v 1.4 2002/07/31 14:02:44 abs Exp $ +$NetBSD: distinfo,v 1.5 2002/08/02 23:01:46 abs Exp $ SHA1 (mserv-0.33.tar.gz) = 4aa66852057942341d9da9c6f839d7ee250f6785 Size (mserv-0.33.tar.gz) = 136456 bytes SHA1 (patch-aa) = 3048bb4253bdd1825495782ba1c3e26bbfb68255 -SHA1 (patch-ab) = cf95b1db0f6c5d58c45805195aaa6321d80abdaa +SHA1 (patch-ab) = 920641a518272fc3b10c0d1fca4f4b926dd26c35 SHA1 (patch-ac) = a8c5fa8039b92318afae6e48329e799e3acc226a SHA1 (patch-ad) = 59497df92f71a54b34752086a27db1e05482e7dc SHA1 (patch-ae) = 6954c13dc501ff0ea55cee19301d584130ca0d24 SHA1 (patch-af) = 819c178948b6aff9352ef35b45e13ab8f0ff84df SHA1 (patch-ag) = e4e2f19bc1b14b20d5a03f7362026a61ffb291bc -SHA1 (patch-ah) = a1cf71e18c3775738af68328aa423277ddb21372 -SHA1 (patch-ai) = eed5668942fdc801685aeda8aa2c31ec24d03729 -SHA1 (patch-aj) = 91080a55922bbd46a4ba55dc4641dfa0171a553e +SHA1 (patch-ah) = ca0dc3be3c02f82d033cab93aaa454d6918d45de +SHA1 (patch-ai) = 572ef68fe6efe77a6f8af71d8136ceb2310ce1d9 +SHA1 (patch-aj) = eed5668942fdc801685aeda8aa2c31ec24d03729 +SHA1 (patch-ak) = 91080a55922bbd46a4ba55dc4641dfa0171a553e diff --git a/audio/mserv/patches/patch-aa b/audio/mserv/patches/patch-aa index 84c680c95f9..5ff9e24f7bf 100644 --- a/audio/mserv/patches/patch-aa +++ b/audio/mserv/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2002/07/31 14:02:44 abs Exp $ +$NetBSD: patch-aa,v 1.4 2002/08/02 23:01:46 abs Exp $ --- Makefile.orig Sat Jul 15 19:29:10 2000 +++ Makefile diff --git a/audio/mserv/patches/patch-ab b/audio/mserv/patches/patch-ab index b6337b88f47..67625fdbc40 100644 --- a/audio/mserv/patches/patch-ab +++ b/audio/mserv/patches/patch-ab @@ -1,12 +1,13 @@ -$NetBSD: patch-ab,v 1.4 2002/07/31 14:02:44 abs Exp $ +$NetBSD: patch-ab,v 1.5 2002/08/02 23:01:46 abs Exp $ ---- mserv/cmd.c.orig Wed Jul 31 14:59:21 2002 +--- mserv/cmd.c.orig Sat Jul 15 18:52:56 2000 +++ mserv/cmd.c -@@ -2790,6 +2790,7 @@ static void mserv_cmd_reset(t_client *cl +@@ -2789,6 +2789,8 @@ static void mserv_cmd_reset(t_client *cl + mserv_response(cl, "RESETER", NULL); return; } - mserv_log("Reset initiated by %s", cl->user); + mserv_broadcast("RESETGO", "%s", cl->user); ++ mserv_flush(); + mserv_log("Reset initiated by %s", cl->user); mserv_reset(); mserv_broadcast("RESET", "%s", cl->user); - if (cl->mode != mode_human) diff --git a/audio/mserv/patches/patch-ac b/audio/mserv/patches/patch-ac index eb59292eb60..688e1b33d15 100644 --- a/audio/mserv/patches/patch-ac +++ b/audio/mserv/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2002/07/31 14:02:44 abs Exp $ +$NetBSD: patch-ac,v 1.3 2002/08/02 23:01:46 abs Exp $ --- mserv/config.h.in.orig Tue Jan 25 19:59:08 2000 +++ mserv/config.h.in diff --git a/audio/mserv/patches/patch-ad b/audio/mserv/patches/patch-ad index 5f83ec21ceb..91dfad98600 100644 --- a/audio/mserv/patches/patch-ad +++ b/audio/mserv/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.2 2002/07/31 14:02:45 abs Exp $ +$NetBSD: patch-ad,v 1.3 2002/08/02 23:01:46 abs Exp $ --- mserv/configure.in.orig Tue Jan 25 19:59:11 2000 +++ mserv/configure.in diff --git a/audio/mserv/patches/patch-ae b/audio/mserv/patches/patch-ae index da9e0794120..79c039d50bf 100644 --- a/audio/mserv/patches/patch-ae +++ b/audio/mserv/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.2 2002/07/31 14:02:45 abs Exp $ +$NetBSD: patch-ae,v 1.3 2002/08/02 23:01:47 abs Exp $ --- mserv/configure.orig Sat Jul 15 19:33:45 2000 +++ mserv/configure diff --git a/audio/mserv/patches/patch-af b/audio/mserv/patches/patch-af index ecf4ccd1723..3ae85dde45c 100644 --- a/audio/mserv/patches/patch-af +++ b/audio/mserv/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.2 2002/07/31 14:02:45 abs Exp $ +$NetBSD: patch-af,v 1.3 2002/08/02 23:01:47 abs Exp $ --- mserv/defconf.c.orig Thu Jul 13 22:20:42 2000 +++ mserv/defconf.c diff --git a/audio/mserv/patches/patch-ag b/audio/mserv/patches/patch-ag index 715b72ec7fb..ad4d88035ca 100644 --- a/audio/mserv/patches/patch-ag +++ b/audio/mserv/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.2 2002/07/31 14:02:45 abs Exp $ +$NetBSD: patch-ag,v 1.3 2002/08/02 23:01:47 abs Exp $ --- mserv/defines.h.orig Thu Jul 13 22:35:18 2000 +++ mserv/defines.h diff --git a/audio/mserv/patches/patch-ah b/audio/mserv/patches/patch-ah index 2f1fc6e2f9e..71ae381cb7c 100644 --- a/audio/mserv/patches/patch-ah +++ b/audio/mserv/patches/patch-ah @@ -1,6 +1,6 @@ -$NetBSD: patch-ah,v 1.2 2002/07/31 14:02:45 abs Exp $ +$NetBSD: patch-ah,v 1.3 2002/08/02 23:01:47 abs Exp $ ---- mserv/english.lang.orig Wed Jul 31 14:58:06 2002 +--- mserv/english.lang.orig Thu Jul 13 23:14:11 2000 +++ mserv/english.lang @@ -207,3 +207,4 @@ DELAY 636 The delay between tracks has b FILTER 637 Random play filter set to '%02' by %01 (%03 incl, %04 excl) diff --git a/audio/mserv/patches/patch-ai b/audio/mserv/patches/patch-ai index aa69a274e82..e5f063dc6b2 100644 --- a/audio/mserv/patches/patch-ai +++ b/audio/mserv/patches/patch-ai @@ -1,15 +1,19 @@ -$NetBSD: patch-ai,v 1.1 2002/08/01 08:51:20 abs Exp $ +$NetBSD: patch-ai,v 1.2 2002/08/02 23:01:47 abs Exp $ ---- mserv/mservplay.c.orig Tue Jan 25 19:59:16 2000 -+++ mserv/mservplay.c -@@ -14,10 +14,6 @@ - #include "defines.h" - #include "misc.h" - --#ifndef PATH_MPG123 --#define PATH_MPG123 "/usr/local/bin/mpg123" --#endif -- - int main(int argc, char *argv[]) - { - const pid_t pid = getpid(); +--- mserv/mserv.c.orig Sat Jul 15 18:01:15 2000 ++++ mserv/mserv.c +@@ -3370,7 +3370,13 @@ int mserv_setmixer(t_client *cl, int wha + mserv_response(cl, "IOCTLWR", NULL); + return -1; + } +- newval = newval & 0xFF; ++ if (ioctl(mixer_fd, MIXER_READ(what), &newval) == -1) { ++ close(mixer_fd); ++ perror("iotcl read"); ++ mserv_response(cl, "IOCTLRD", 0); ++ return -1; ++ } ++ newval = newval & 0xff; + if (type == 0 || newval != curval) + break; + param++; diff --git a/audio/mserv/patches/patch-aj b/audio/mserv/patches/patch-aj index cc336ef9ab8..55194d8a250 100644 --- a/audio/mserv/patches/patch-aj +++ b/audio/mserv/patches/patch-aj @@ -1,15 +1,15 @@ -$NetBSD: patch-aj,v 1.1 2002/08/01 08:51:21 abs Exp $ +$NetBSD: patch-aj,v 1.2 2002/08/02 23:01:47 abs Exp $ ---- mserv/opt.c.orig Thu Jul 13 22:14:41 2000 -+++ mserv/opt.c -@@ -164,8 +164,8 @@ int opt_read(const char *root) - /* special case - player variable is an indirected to another variable */ - if ((val = conf_getvalue("player")) == NULL) { - if (mserv_verbose) -- printf("No player specified, defaulting to /usr/local/bin/mpg123\n"); -- opt_player = "/usr/local/bin/mpg123"; -+ printf("No player specified, defaulting to " PATH_MPG123 "\n"); -+ opt_player = PATH_MPG123; - } else { - if ((opt_player = conf_getvalue(val)) == NULL) { - fprintf(stderr, "%s: player setting '%s' not found\n", progname, +--- mserv/mservplay.c.orig Tue Jan 25 19:59:16 2000 ++++ mserv/mservplay.c +@@ -14,10 +14,6 @@ + #include "defines.h" + #include "misc.h" + +-#ifndef PATH_MPG123 +-#define PATH_MPG123 "/usr/local/bin/mpg123" +-#endif +- + int main(int argc, char *argv[]) + { + const pid_t pid = getpid(); diff --git a/audio/mserv/patches/patch-ak b/audio/mserv/patches/patch-ak new file mode 100644 index 00000000000..cbc9052e451 --- /dev/null +++ b/audio/mserv/patches/patch-ak @@ -0,0 +1,15 @@ +$NetBSD: patch-ak,v 1.1 2002/08/02 23:01:48 abs Exp $ + +--- mserv/opt.c.orig Thu Jul 13 22:14:41 2000 ++++ mserv/opt.c +@@ -164,8 +164,8 @@ int opt_read(const char *root) + /* special case - player variable is an indirected to another variable */ + if ((val = conf_getvalue("player")) == NULL) { + if (mserv_verbose) +- printf("No player specified, defaulting to /usr/local/bin/mpg123\n"); +- opt_player = "/usr/local/bin/mpg123"; ++ printf("No player specified, defaulting to " PATH_MPG123 "\n"); ++ opt_player = PATH_MPG123; + } else { + if ((opt_player = conf_getvalue(val)) == NULL) { + fprintf(stderr, "%s: player setting '%s' not found\n", progname, |