diff options
| author | drochner <drochner> | 2009-02-11 18:30:42 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2009-02-11 18:30:42 +0000 |
| commit | 84580e9ba5523578870387a3ca441bb75aaf305e (patch) | |
| tree | aa471c6a33d9b9836e15fdf281bea3c5bfbb6b72 /audio/musicpd | |
| parent | 5496aea30c0261eea04898dc7a39647143270050 (diff) | |
| download | pkgsrc-84580e9ba5523578870387a3ca441bb75aaf305e.tar.gz | |
replace my quick-and-dirty patch fixing mikmod play with the upstream
version, to ease further updates
Diffstat (limited to 'audio/musicpd')
| -rw-r--r-- | audio/musicpd/distinfo | 4 | ||||
| -rw-r--r-- | audio/musicpd/patches/patch-aa | 33 |
2 files changed, 31 insertions, 6 deletions
diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo index db9f6b79bfb..b5b2cb54072 100644 --- a/audio/musicpd/distinfo +++ b/audio/musicpd/distinfo @@ -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 --git a/audio/musicpd/patches/patch-aa b/audio/musicpd/patches/patch-aa index 36c19566d65..e92556d8b79 100644 --- a/audio/musicpd/patches/patch-aa +++ b/audio/musicpd/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.6 2009/01/28 18:06:21 drochner Exp $ } 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; + } + |