Wed Feb 11 18:30:42 2009 UTC ()
replace my quick-and-dirty patch fixing mikmod play with the upstream
version, to ease further updates


(drochner)
diff -r1.16 -r1.17 pkgsrc/audio/musicpd/distinfo
diff -r1.6 -r1.7 pkgsrc/audio/musicpd/patches/patch-aa
cvs diff -r1.16 -r1.17 pkgsrc/audio/musicpd/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/distinfo 2009/01/28 18:06:21 1.16
+++ pkgsrc/audio/musicpd/distinfo 2009/02/11 18:30:42 1.17
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.16 2009/01/28 18:06:21 drochner Exp $ 1$NetBSD: distinfo,v 1.17 2009/02/11 18:30:42 drochner Exp $
2 2
3SHA1 (mpd-0.14.1.tar.bz2) = e87424caafca366c15744a31cbc34197474862f9 3SHA1 (mpd-0.14.1.tar.bz2) = e87424caafca366c15744a31cbc34197474862f9
4RMD160 (mpd-0.14.1.tar.bz2) = b3ae29717f22e4e7bf03a0356b6ca3a0c96bbb60 4RMD160 (mpd-0.14.1.tar.bz2) = b3ae29717f22e4e7bf03a0356b6ca3a0c96bbb60
5Size (mpd-0.14.1.tar.bz2) = 286850 bytes 5Size (mpd-0.14.1.tar.bz2) = 286850 bytes
6SHA1 (patch-aa) = 7b2a39591c08ac8af3157880ca3ccfeaf6db6fd4 6SHA1 (patch-aa) = e80bb8ec79992a29704b818143caccf777e346f9
cvs diff -r1.6 -r1.7 pkgsrc/audio/musicpd/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/musicpd/patches/Attic/patch-aa 2009/01/28 18:06:21 1.6
+++ pkgsrc/audio/musicpd/patches/Attic/patch-aa 2009/02/11 18:30:42 1.7
@@ -1,13 +1,38 @@ @@ -1,13 +1,38 @@
1$NetBSD: patch-aa,v 1.6 2009/01/28 18:06:21 drochner Exp $ 1$NetBSD: patch-aa,v 1.7 2009/02/11 18:30:42 drochner Exp $
2 2
3--- ./src/decoder/mod_plugin.c.orig 2009-01-17 20:41:09.000000000 +0100 3--- src/decoder/mod_plugin.c.orig 2009-01-17 20:41:09.000000000 +0100
4+++ ./src/decoder/mod_plugin.c 4+++ src/decoder/mod_plugin.c
5@@ -195,8 +195,6 @@ mod_decode(struct decoder *decoder, cons 5@@ -172,7 +172,6 @@ mod_decode(struct decoder *decoder, cons
 6
 7 if (!(data = mod_open(path))) {
 8 ERROR("failed to open mod: %s\n", path);
 9- MikMod_Exit();
 10 return;
 11 }
 12
 13@@ -195,8 +194,6 @@ mod_decode(struct decoder *decoder, cons
6 } 14 }
7  15
8 mod_close(data); 16 mod_close(data);
9- 17-
10- MikMod_Exit(); 18- MikMod_Exit();
11 } 19 }
12  20
13 static struct tag *modTagDup(const char *file) 21 static struct tag *modTagDup(const char *file)
 22@@ -212,7 +209,6 @@ static struct tag *modTagDup(const char
 23
 24 if (moduleHandle == NULL) {
 25 DEBUG("modTagDup: Failed to open file: %s\n", file);
 26- MikMod_Exit();
 27 return NULL;
 28
 29 }
 30@@ -228,8 +224,6 @@ static struct tag *modTagDup(const char
 31 if (title)
 32 tag_add_item(ret, TAG_ITEM_TITLE, title);
 33
 34- MikMod_Exit();
 35-
 36 return ret;
 37 }
 38