[pkgsrc/trunk]: pkgsrc/audio/musicpd replace my quick-and-dirty patch fixing ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc3c9fcaef20
branches:  trunk
changeset: 554260:fc3c9fcaef20
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Feb 11 18:30:42 2009 +0000

description:
replace my quick-and-dirty patch fixing mikmod play with the upstream
version, to ease further updates

diffstat:

 audio/musicpd/distinfo         |   4 ++--
 audio/musicpd/patches/patch-aa |  33 +++++++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r b4f4f5ca4fca -r fc3c9fcaef20 audio/musicpd/distinfo
--- a/audio/musicpd/distinfo    Wed Feb 11 18:23:58 2009 +0000
+++ b/audio/musicpd/distinfo    Wed Feb 11 18:30:42 2009 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2009/01/28 18:06:21 drochner Exp $
+$NetBSD: distinfo,v 1.17 2009/02/11 18:30:42 drochner Exp $
 
 SHA1 (mpd-0.14.1.tar.bz2) = e87424caafca366c15744a31cbc34197474862f9
 RMD160 (mpd-0.14.1.tar.bz2) = b3ae29717f22e4e7bf03a0356b6ca3a0c96bbb60
 Size (mpd-0.14.1.tar.bz2) = 286850 bytes
-SHA1 (patch-aa) = 7b2a39591c08ac8af3157880ca3ccfeaf6db6fd4
+SHA1 (patch-aa) = e80bb8ec79992a29704b818143caccf777e346f9
diff -r b4f4f5ca4fca -r fc3c9fcaef20 audio/musicpd/patches/patch-aa
--- a/audio/musicpd/patches/patch-aa    Wed Feb 11 18:23:58 2009 +0000
+++ b/audio/musicpd/patches/patch-aa    Wed Feb 11 18:30:42 2009 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.6 2009/01/28 18:06:21 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2009/02/11 18:30:42 drochner Exp $
 
---- ./src/decoder/mod_plugin.c.orig    2009-01-17 20:41:09.000000000 +0100
-+++ ./src/decoder/mod_plugin.c
-@@ -195,8 +195,6 @@ mod_decode(struct decoder *decoder, cons
+--- src/decoder/mod_plugin.c.orig      2009-01-17 20:41:09.000000000 +0100
++++ src/decoder/mod_plugin.c
+@@ -172,7 +172,6 @@ mod_decode(struct decoder *decoder, cons
+ 
+       if (!(data = mod_open(path))) {
+               ERROR("failed to open mod: %s\n", path);
+-              MikMod_Exit();
+               return;
+       }
+ 
+@@ -195,8 +194,6 @@ mod_decode(struct decoder *decoder, cons
        }
  
        mod_close(data);
@@ -11,3 +19,20 @@
  }
  
  static struct tag *modTagDup(const char *file)
+@@ -212,7 +209,6 @@ static struct tag *modTagDup(const char 
+ 
+       if (moduleHandle == NULL) {
+               DEBUG("modTagDup: Failed to open file: %s\n", file);
+-              MikMod_Exit();
+               return NULL;
+ 
+       }
+@@ -228,8 +224,6 @@ static struct tag *modTagDup(const char 
+       if (title)
+               tag_add_item(ret, TAG_ITEM_TITLE, title);
+ 
+-      MikMod_Exit();
+-
+       return ret;
+ }
+