[pkgsrc/trunk]: pkgsrc/audio/mserv Update mserv to 0.35nb8:

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a717e51878eb
branches:  trunk
changeset: 469109:a717e51878eb
user:      abs <abs%pkgsrc.org@localhost>
date:      Fri Feb 20 00:41:16 2004 +0000

description:
Update mserv to 0.35nb8:
        Fix parsing of ID3v1 data, fix some off by one malloc()s and default
        album author to tracks' author.

diffstat:

 audio/mserv/Makefile         |    4 +-
 audio/mserv/distinfo         |   15 +-
 audio/mserv/patches/patch-aa |    8 +-
 audio/mserv/patches/patch-ab |    8 +-
 audio/mserv/patches/patch-ac |  247 ++++++++++++-----------------
 audio/mserv/patches/patch-ad |   21 ++
 audio/mserv/patches/patch-ae |   88 ++++++++++
 audio/mserv/patches/patch-af |  351 ++++++++++++++++++++++++++++++------------
 audio/mserv/patches/patch-ag |   43 ++--
 audio/mserv/patches/patch-am |   15 -
 10 files changed, 501 insertions(+), 299 deletions(-)

diffs (truncated from 864 to 300 lines):

diff -r 8e4e2121d7d1 -r a717e51878eb audio/mserv/Makefile
--- a/audio/mserv/Makefile      Fri Feb 20 00:38:58 2004 +0000
+++ b/audio/mserv/Makefile      Fri Feb 20 00:41:16 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:33 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/20 00:41:16 abs Exp $
 #
 
 DISTNAME=      mserv-0.35
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    audio
 MASTER_SITES=  http://www.mserv.org/download/
 
diff -r 8e4e2121d7d1 -r a717e51878eb audio/mserv/distinfo
--- a/audio/mserv/distinfo      Fri Feb 20 00:38:58 2004 +0000
+++ b/audio/mserv/distinfo      Fri Feb 20 00:41:16 2004 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.15 2003/12/04 10:11:27 abs Exp $
+$NetBSD: distinfo,v 1.16 2004/02/20 00:41:16 abs Exp $
 
 SHA1 (mserv-0.35.tar.gz) = 850835946e4d5a0deccdd22a18f30170c0a7b57c
 Size (mserv-0.35.tar.gz) = 280299 bytes
-SHA1 (patch-aa) = 22bb3f2af2494e50456c9b1bf136774b3b300aae
-SHA1 (patch-ab) = 9d1b9fe0ee1b5392e2249b50d3e27426b17c9c04
-SHA1 (patch-ac) = 535900af6550bf340068fd10af7d7564ed2fb4c4
-SHA1 (patch-af) = 2839b8e0c51a4c1c182173abc1c406b66a915ac4
-SHA1 (patch-ag) = 232ce715468e8a59820b856a586dc708d65a2b5e
-SHA1 (patch-am) = 925a304562d89c3aca32a3f07f00eab912e8d2dd
+SHA1 (patch-aa) = 3756e6b338ad8501daa258237868e9ef2d96cb49
+SHA1 (patch-ab) = 91d6840eae30182343db97d3f67d23d0c423dbe7
+SHA1 (patch-ac) = 068b14b4a8a0ce4dcb19e0cd28fc6a7296f86dad
+SHA1 (patch-ad) = 105edf313c2101f0961aab8a94022a5a0d07eb22
+SHA1 (patch-ae) = 559f2ecf11bcd25b5ea3423dff4b1a4bf4066b78
+SHA1 (patch-af) = ea56ea4f0c7f807484ff9e75f798fea7f3335df3
+SHA1 (patch-ag) = 7d5fae48c89db4b9bdccf371528c3b3e890455a9
diff -r 8e4e2121d7d1 -r a717e51878eb audio/mserv/patches/patch-aa
--- a/audio/mserv/patches/patch-aa      Fri Feb 20 00:38:58 2004 +0000
+++ b/audio/mserv/patches/patch-aa      Fri Feb 20 00:41:16 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2003/09/03 19:55:28 abs Exp $
+$NetBSD: patch-aa,v 1.8 2004/02/20 00:41:16 abs Exp $
 
---- mserv/Makefile.in.orig     2003-08-03 16:57:19.000000000 +0200
-+++ mserv/Makefile.in  2003-09-03 14:01:16.000000000 +0200
-@@ -130,7 +130,7 @@
+--- mserv/Makefile.in.orig     Sun Aug  3 15:57:19 2003
++++ mserv/Makefile.in
+@@ -130,7 +130,7 @@ target_cpu = @target_cpu@
  target_os = @target_os@
  target_vendor = @target_vendor@
  
diff -r 8e4e2121d7d1 -r a717e51878eb audio/mserv/patches/patch-ab
--- a/audio/mserv/patches/patch-ab      Fri Feb 20 00:38:58 2004 +0000
+++ b/audio/mserv/patches/patch-ab      Fri Feb 20 00:41:16 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2003/09/03 12:35:12 martin Exp $
+$NetBSD: patch-ab,v 1.8 2004/02/20 00:41:16 abs Exp $
 
---- mserv/cmd.c.orig   2003-08-02 16:26:19.000000000 +0200
-+++ mserv/cmd.c        2003-09-03 13:51:41.000000000 +0200
-@@ -51,7 +51,7 @@
+--- mserv/cmd.c.orig   Sat Aug  2 15:26:19 2003
++++ mserv/cmd.c
+@@ -51,7 +51,7 @@ met:
  #include <math.h>
  #include "mserv.h"
  #include "misc.h"
diff -r 8e4e2121d7d1 -r a717e51878eb audio/mserv/patches/patch-ac
--- a/audio/mserv/patches/patch-ac      Fri Feb 20 00:38:58 2004 +0000
+++ b/audio/mserv/patches/patch-ac      Fri Feb 20 00:41:16 2004 +0000
@@ -1,145 +1,108 @@
-$NetBSD: patch-ac,v 1.9 2003/12/04 10:11:27 abs Exp $
+$NetBSD: patch-ac,v 1.10 2004/02/20 00:41:16 abs Exp $
 
---- mserv/mserv.c.orig Sun Aug  3 15:57:20 2003
-+++ mserv/mserv.c
-@@ -62,12 +62,17 @@ met:
- #include <sys/ioctl.h>
- #include <time.h>
+--- mserv/defconf.c.orig       Mon Aug  4 19:25:36 2003
++++ mserv/defconf.c
+@@ -1,54 +1,53 @@
+ #include "defines.h"
  
-+#ifdef PARSE_OGG_INFO
-+#include <vorbis/codec.h>
-+#include <vorbis/vorbisfile.h>
-+#endif
-+
- #include "mserv.h"
- #include "misc.h"
- #include "cmd.h"
- #include "acl.h"
- #include "mp3info.h"
--#include "soundcard.h"
-+#include "mservsoundcard.h"
- #include "defconf.h"
- #include "conf.h"
- #include "opt.h"
-@@ -2019,11 +2024,13 @@ static t_track *mserv_loadtrk(const char
-       alen = strlen(buffer);
-       if (buffer[alen-1] != '\n') {
-       mserv_log("Line %d too long in '%s'", line, fullpath_trk);
-+      fclose(fd);
-       return NULL;
-       }
-       buffer[--alen] = '\0';
-       if (!(l = strcspn(buffer, "=")) || l >= 64) {
-       mserv_log("Invalid track line %d in '%s'", line, fullpath_trk);
-+      fclose(fd);
-       return NULL;
-       }
-       strncpy(token, buffer, l);
-@@ -2059,6 +2066,7 @@ static t_track *mserv_loadtrk(const char
-       }
-       if ((arate = malloc(sizeof(t_rating)+strlen(token)+1)) == NULL) {
-         mserv_log("Out of memory creating ratings for '%s'", fullpath_trk);
-+        fclose(fd);
-         return NULL;
-       }
-       memset(arate, 0, sizeof(t_rating));
-@@ -2082,15 +2090,18 @@ static t_track *mserv_loadtrk(const char
-     }
-     if (!*author) {
-       mserv_log("No author specified in '%s'", fullpath_trk);
-+      fclose(fd);
-       return NULL;
-     }
-     if (!*name) {
-       mserv_log("No name specified in '%s'", fullpath_trk);
-+      fclose(fd);
-       return NULL;
-     }
-     if (fstat(fileno(fd), &buf) == -1) {
-       perror("fstat");
-       mserv_log("Unable to stat '%s': %s", filename, strerror(errno));
-+      fclose(fd);
-       return NULL;
-     }
-     mtime = buf.st_mtime;
-@@ -2098,8 +2109,17 @@ static t_track *mserv_loadtrk(const char
-   }
-   if (duration == 0 && !*miscinfo) {
-     len = strlen(fullpath_file);
-+#ifdef PARSE_OGG_INFO
-+    if (len > 4 && !stricmp(".mp3", fullpath_file+len-4) ||
-+      !stricmp(".ogg", fullpath_file+len-4)) {
-+      if (!stricmp(".mp3", fullpath_file+len-4))
-+        duration = mserv_mp3info_readlen(fullpath_file, &bitrate, &id3tag);
-+      else
-+        duration = mserv_ogginfo_readlen(fullpath_file, &bitrate, &id3tag);
-+#else
-     if (len > 4 && !stricmp(".mp3", fullpath_file+len-4)) {
-       duration = mserv_mp3info_readlen(fullpath_file, &bitrate, &id3tag);
-+#endif
-       if (duration == -1) {
-       mserv_log("Unable to determine details of mp3 '%s': %s",
-                 filename, strerror(errno));
-@@ -3427,6 +3447,62 @@ int mserv_setmixer(t_client *cl, int wha
-   close(mixer_fd);
-   mserv_response(cl, "NAN", NULL);
-   return -1;
-+}
-+
-+#endif
-+
-+#ifdef PARSE_OGG_INFO
-+int mserv_ogginfo_readlen(const char *fname, int *bitrate_ret,
-+                        t_id3tag *id3tag)
-+{
-+  OggVorbis_File    vf;
-+  FILE              *f;
-+  ogg_sync_state    sync;
-+  vorbis_info     *vi;
-+  vorbis_comment    *vc;
-+  char                    **comment;
-+  double          duration;
-+
-+  if (id3tag)
-+    memset(id3tag, 0, sizeof(*id3tag));
-+
-+  if ((f = fopen(fname, "rb")) == NULL)
-+    return -1;
-+
-+  if (ov_open(f, &vf, NULL, 0) < 0) {
-+    fclose(f);
-+    return -1;
-+  }
-+
-+  if ( !(vi = ov_info(&vf, -1)) || !(vc = ov_comment(&vf, -1))) {
-+    ov_clear(&vf);
-+    fclose(f);
-+    return -1;
-+    }
-+
-+  if (bitrate_ret)
-+    *bitrate_ret = vi->bitrate_nominal/1024;
-+
-+  for (comment = vc->user_comments ; *comment ; ++comment) {
-+    if (strncasecmp(*comment, "title=", 6) == 0) {
-+      strlcpy(id3tag->title, *comment + 6, MP3ID3_TITLELEN+1);
-+        id3tag->present = 1;
-+    }
-+    else if (strncasecmp(*comment, "artist=", 7) == 0)
-+      strlcpy(id3tag->artist, *comment + 7, MP3ID3_ARTISTLEN+1);
-+    else if (strncasecmp(*comment, "album=", 6) == 0)
-+      strlcpy(id3tag->album, *comment + 6, MP3ID3_ALBUMLEN+1);
-+    else if (strncasecmp(*comment, "date=", 5) == 0)
-+      strlcpy(id3tag->year, *comment + 5, MP3ID3_YEARLEN+1);
-+    else if (strncasecmp(*comment, "genre=", 6) == 0)
-+      strlcpy(id3tag->genre, *comment + 6, 31);
-+    /* tracknumber ignored */
-+  }
-+
-+  duration = ov_time_total(&vf, -1);
-+  ov_clear(&vf);
-+  fclose(f);
-+  return (int)duration * 100;
- }
+-const char defconf_file[] = "# Mserv configuration file for 0.33 and later\n\
+-\n\
+-# File locations, / at start is absolute, otherwise relative to mserv root\n\
+-path_acl=acl\n\
+-path_webacl=webacl\n\
+-path_logfile=log\n\
+-path_tracks=tracks\n\
+-path_trackinfo=trackinfo\n\
+-path_playout=player.out\n\
+-path_idea=idea\n\
+-path_mixer=/dev/mixer\n\
+-path_language=" DATADIR "/english.lang\n\
+-\n\
+-# Define player invokation methods\n\
+-# mservplay is our special wrapper, the first parameter is a 'nice' level\n\
+-# play is part of sox\n\
+-prog_mpg123=/usr/local/bin/mpg123 -b 1024\n\
+-prog_freeamp=/usr/local/bin/freeamp -ui mpg123\n\
+-prog_mservplay=/usr/local/bin/mservplay 0 mpg123 -b 1024\n\
+-prog_play=/usr/local/bin/play\n\
+-prog_ogg123=/usr/local/bin/ogg123\n\
+-\n\
+-# Set players for each file extension we want to support, unknown extensions\n\
+-# are ignored by mserv\n\
+-player_mp3=prog_mpg123\n\
+-player_wav=prog_play\n\
+-player_au=prog_play\n\
+-player_ogg=prog_ogg\n\
+-\n\
+-# Set default random mode, either on or off.  You must still tell mserv to\n\
+-# start playing (PLAY).\n\
+-random=off\n\
+-\n\
+-# Set whether or not you would like play to start as soon as mserv has loaded.\n\
+-play=off\n\
+-\n\
+-# Set default random factor, 0.5 is completely random, 0.6 is less random\n\
+-# and takes into account your ratings, 0.4 plays your worst tunes. 0.99 max.\n\
+-factor=0.60\n\
+-\n\
+-# Set default filter, leave blank for off.  Example: \"!classical\" to\n\
+-# not play classical genre, or \"year>=1980&year<1990\" to only play\n\
+-# 80's songs.\n\
+-filter=\n\
+-\n\
+-# Set gap between songs, in seconds.  0 to start the next song as quick as\n\
+-# possible.\n\
+-gap=1\n\
+-\n\
+-";
++const char defconf_file[] = "# Mserv configuration file for 0.33 and later\n"
++"\n"
++"# File locations, / at start is absolute, otherwise relative to mserv root\n"
++"path_acl=acl\n"
++"path_webacl=webacl\n"
++"path_logfile=log\n"
++"path_tracks=tracks\n"
++"path_trackinfo=trackinfo\n"
++"path_playout=player.out\n"
++"path_idea=idea\n"
++"path_mixer=/dev/mixer\n"
++"path_language=" DATADIR "/english.lang\n"
++"\n"
++"# Define player invokation methods\n"
++"# mservplay is our special wrapper, the first parameter is a 'nice' level\n"
++"# play is part of sox\n"
++"prog_mpg123=" PATH_MPG123 " -b 1024\n"
++"prog_freeamp=/usr/local/bin/freeamp -ui " PATH_MPG123 "\n"
++"prog_mservplay=/usr/local/bin/mservplay 0 " PATH_MPG123 " -b 1024\n"
++"prog_play=/usr/local/bin/play\n"
++"prog_ogg123=/usr/local/bin/ogg123\n"
++"\n"
++"# Set players for each file extension we want to support, unknown extensions\n"
++"# are ignored by mserv\n"
++"player_mp3=prog_mpg123\n"
++"player_wav=prog_play\n"
++"player_au=prog_play\n"
++"player_ogg=prog_ogg123\n"
++"\n"
++"# Set default random mode, either on or off.  You must still tell mserv to\n"