diff options
| author | tnn <tnn> | 2009-08-10 23:10:29 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2009-08-10 23:10:29 +0000 |
| commit | 4c9e2b773658b26504d31a9b70c85617b735a789 (patch) | |
| tree | efd21164acf270119e0562ded83be6ee40ccc753 /audio | |
| parent | de9e93f95a0b18327934f802b7d1e61e5fbb2739 (diff) | |
| download | pkgsrc-4c9e2b773658b26504d31a9b70c85617b735a789.tar.gz | |
patch LP64 bug in AAC plugin (Raymond Meyer via PR pkg/41872)
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/musicpd/Makefile | 3 | ||||
| -rw-r--r-- | audio/musicpd/patches/patch-ab | 30 |
2 files changed, 32 insertions, 1 deletions
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile index 95ad73d2e71..38d54e75b36 100644 --- a/audio/musicpd/Makefile +++ b/audio/musicpd/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.38 2009/07/27 20:08:38 drochner Exp $ +# $NetBSD: Makefile,v 1.39 2009/08/10 23:10:29 tnn Exp $ DISTNAME= mpd-0.15.1 PKGNAME= ${DISTNAME:S/mpd/musicpd/} +PKGREVISION= 1 CATEGORIES= audio #MASTER_SITES= http://musicpd.org/uploads/files/ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=musicpd/} diff --git a/audio/musicpd/patches/patch-ab b/audio/musicpd/patches/patch-ab new file mode 100644 index 00000000000..cfb8b65a58e --- /dev/null +++ b/audio/musicpd/patches/patch-ab @@ -0,0 +1,30 @@ +$NetBSD: patch-ab,v 1.5 2009/08/10 23:10:29 tnn Exp $ + +--- src/decoder/mp4ff_plugin.c.orig 2009-07-15 22:34:45.000000000 +0200 ++++ src/decoder/mp4ff_plugin.c +@@ -47,7 +47,7 @@ mp4_get_aac_track(mp4ff_t * infile, faac + /* neaacdec.h declares all arguments as "unsigned long", but + internally expects uint32_t pointers. To avoid gcc + warnings, use this workaround. */ +- unsigned long *sample_rate_r = (unsigned long*)sample_rate; ++ unsigned long sample_rate_r; + #else + uint32_t *sample_rate_r = sample_rate; + #endif +@@ -73,12 +73,14 @@ mp4_get_aac_track(mp4ff_t * infile, faac + continue; + + rc = faacDecInit2(decoder, buff, buff_size, +- sample_rate_r, channels_r); ++ &sample_rate_r, channels_r); + free(buff); + +- if (rc >= 0) ++ if (rc >= 0) { + /* found a valid AAC track */ ++ *sample_rate = (uint32_t)sample_rate_r; + return i; ++ } + } + + /* can't decode this */ |