[pkgsrc/trunk]: pkgsrc/audio/musicpd patch LP64 bug in AAC plugin (Raymond Me...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb1e3dbdf350
branches:  trunk
changeset: 397368:cb1e3dbdf350
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Aug 10 23:10:29 2009 +0000

description:
patch LP64 bug in AAC plugin (Raymond Meyer via PR pkg/41872)

diffstat:

 audio/musicpd/Makefile         |   3 ++-
 audio/musicpd/patches/patch-ab |  30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diffs (47 lines):

diff -r 7d13299a2f37 -r cb1e3dbdf350 audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Mon Aug 10 23:03:20 2009 +0000
+++ b/audio/musicpd/Makefile    Mon Aug 10 23:10:29 2009 +0000
@@ -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 -r 7d13299a2f37 -r cb1e3dbdf350 audio/musicpd/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/musicpd/patches/patch-ab    Mon Aug 10 23:10:29 2009 +0000
@@ -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 */