diff options
| author | drochner <drochner@pkgsrc.org> | 2007-02-09 20:32:38 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2007-02-09 20:32:38 +0000 |
| commit | 5932fd122bf990e43c00e20e2212673c9fe9d654 (patch) | |
| tree | 596a71892ea12ee5e24ec614833118880eb84295 /audio/daapd | |
| parent | 5f6e6b5e4cc9fe333fe20c9aa8030e7b271473e3 (diff) | |
| download | pkgsrc-5932fd122bf990e43c00e20e2212673c9fe9d654.tar.gz | |
build against libmp4v2 instead of the full mpeg4ip and bump PKGREVISION
where the default build is affected
Diffstat (limited to 'audio/daapd')
| -rw-r--r-- | audio/daapd/distinfo | 3 | ||||
| -rw-r--r-- | audio/daapd/options.mk | 4 | ||||
| -rw-r--r-- | audio/daapd/patches/patch-af | 13 |
3 files changed, 17 insertions, 3 deletions
diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo index 8c6d5ccfb3a..789c21bae78 100644 --- a/audio/daapd/distinfo +++ b/audio/daapd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2006/07/03 15:51:46 tron Exp $ +$NetBSD: distinfo,v 1.18 2007/02/09 20:32:38 drochner Exp $ SHA1 (daapd-0.2.4b.tgz) = 0903303f155c19ae12cdc78be05799508156a16b RMD160 (daapd-0.2.4b.tgz) = 899b37b3872623ef918f7faa4eb8bad2dfc5b369 @@ -7,3 +7,4 @@ SHA1 (patch-aa) = c10564ede45fa92b18926da68a7a9a2d9547627d SHA1 (patch-ac) = 0a4e3dfb010bbf2cc01843987c970548cb4c646f SHA1 (patch-ad) = 05a61ced18d5b0827ade7e6b3341430ff9b9e89d SHA1 (patch-ae) = 3433d7e944999e10690ccdda1d49d3c711671446 +SHA1 (patch-af) = 1a453dde4dd7d33061a500729b9ef5d89e850133 diff --git a/audio/daapd/options.mk b/audio/daapd/options.mk index cdae2451764..91d2f756b29 100644 --- a/audio/daapd/options.mk +++ b/audio/daapd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2007/01/30 07:05:58 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2007/02/09 20:32:38 drochner Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.daapd PKG_SUPPORTED_OPTIONS= mpeg4ip @@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS= mpeg4ip .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mmpeg4ip) -.include "../../multimedia/mpeg4ip/buildlink3.mk" +.include "../../multimedia/libmp4v2/buildlink3.mk" MAKE_ENV+= WITH_FAAD=1 .else MAKE_ENV+= WITH_FAAD=0 diff --git a/audio/daapd/patches/patch-af b/audio/daapd/patches/patch-af new file mode 100644 index 00000000000..06ee965c619 --- /dev/null +++ b/audio/daapd/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2007/02/09 20:32:38 drochner Exp $ + +--- db.cc.orig 2007-02-09 16:49:38.000000000 +0100 ++++ db.cc +@@ -325,7 +325,7 @@ void Database::addM4a( std::string& path + MP4TrackId trackId = MP4FindTrackId(mp4file, 0); + u32 timeScale = MP4GetTrackTimeScale(mp4file, trackId); + MP4Duration trackDuration = MP4GetTrackDuration(mp4file, trackId); +- double msDuration = UINT64_TO_DOUBLE(MP4ConvertFromTrackDuration(mp4file, trackId, trackDuration, MP4_MSECS_TIME_SCALE)); ++ double msDuration = (double)MP4ConvertFromTrackDuration(mp4file, trackId, trackDuration, MP4_MSECS_TIME_SCALE); + u32 avgBitRate = MP4GetTrackBitRate(mp4file, trackId); + song->time = (u32) (msDuration); + song->bitrate = (u16) ((avgBitRate + 500) / 1000); |