- get libmp4v2 from multimedia/libmp4v2 instead of audio/faad

- @bin marker

ok brad@
This commit is contained in:
jakemsr 2008-09-15 21:49:10 +00:00
parent c020f391dd
commit 8b611cc081
3 changed files with 17 additions and 4 deletions

View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2007/09/15 21:26:00 simon Exp $ # $OpenBSD: Makefile,v 1.6 2008/09/15 21:49:10 jakemsr Exp $
COMMENT= server for the DAA protocol COMMENT= server for the DAA protocol
DISTNAME= daapd-0.2.4b DISTNAME= daapd-0.2.4b
PKGNAME= ${DISTNAME}p0
EXTRACT_SUFX= .tgz EXTRACT_SUFX= .tgz
CATEGORIES= audio net CATEGORIES= audio net
MASTER_SITES= ${HOMEPAGE} MASTER_SITES= ${HOMEPAGE}
@ -14,7 +15,7 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
LIB_DEPENDS= mp4v2::audio/faad \ LIB_DEPENDS= mp4v2.>=1::multimedia/libmp4v2 \
id3tag.>=3.0::audio/libid3tag \ id3tag.>=3.0::audio/libid3tag \
howl::net/howl howl::net/howl

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-db_cc,v 1.1 2008/09/15 21:49:10 jakemsr Exp $
--- db.cc.orig Tue Jul 22 02:40:07 2008
+++ db.cc Tue Jul 22 02:40:07 2008
@@ -325,7 +325,7 @@ void Database::addM4a( std::string& path, struct stat
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);

View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/01/21 06:49:11 jolan Exp $ @comment $OpenBSD: PLIST,v 1.2 2008/09/15 21:49:10 jakemsr Exp $
bin/daapd @bin bin/daapd
@man man/man8/daapd.8 @man man/man8/daapd.8
share/doc/daapd/ share/doc/daapd/
share/doc/daapd/FAQ share/doc/daapd/FAQ