build against libmp4v2 instead of the full mpeg4ip and bump PKGREVISION

where the default build is affected

8 files changed, 29 insertions, 14 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 1646190e19d..6cbfefad4f1 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2007/02/07 20:19:54 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2007/02/09 20:32:38 drochner Exp $
 
 DISTNAME=		amarok-1.4.5
+PKGREVISION=		1
 CATEGORIES=		audio kde
 MASTER_SITES=		${MASTER_SITE_KDE:=amarok/1.4.5/src/}
 EXTRACT_SUFX=		.tar.bz2
@@ -65,7 +66,7 @@ BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.4
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../multimedia/kdemultimedia3/buildlink3.mk"
-.include "../../multimedia/mpeg4ip/buildlink3.mk"
+.include "../../multimedia/libmp4v2/buildlink3.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
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);
diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index 82a67fa7eb4..31429ecbf0f 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2007/01/07 12:25:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/09 20:32:38 drochner Exp $
 #
 
 DISTNAME=	easytag-1.99.13
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=easytag/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/easytag-devel/options.mk b/audio/easytag-devel/options.mk
index 4b8a1506a54..11ba089d449 100644
--- a/audio/easytag-devel/options.mk
+++ b/audio/easytag-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/07/03 09:42:30 jmmv Exp $
+# $NetBSD: options.mk,v 1.2 2007/02/09 20:32:38 drochner Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.easytag-gtk2
 PKG_SUPPORTED_OPTIONS=	flac mpeg4ip ogg
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--disable-flac
 .endif
 
 .if !empty(PKG_OPTIONS:Mmpeg4ip)
-.include "../../multimedia/mpeg4ip/buildlink3.mk"
+.include "../../multimedia/libmp4v2/buildlink3.mk"
 # for mpeg4ip.h
 CPPFLAGS+=		-DHAVE_GTK
 .endif
diff --git a/audio/gtkpod/options.mk b/audio/gtkpod/options.mk
index 3edac5cccda..7315b25ab46 100644
--- a/audio/gtkpod/options.mk
+++ b/audio/gtkpod/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2006/06/08 09:09:21 hira Exp $
+# $NetBSD: options.mk,v 1.3 2007/02/09 20:32:38 drochner Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.gtkpod
 PKG_SUPPORTED_OPTIONS=		mpeg4ip
@@ -8,5 +8,5 @@ PKG_OPTIONS_LEGACY_OPTS+=	faad:mpeg4ip
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mmpeg4ip)
-.  include "../../multimedia/mpeg4ip/buildlink3.mk"
+.  include "../../multimedia/libmp4v2/buildlink3.mk"
 .endif
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index 95b49b7d7fe..f6d82e9ee68 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2007/01/07 12:25:52 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/09 20:32:38 drochner Exp $
 
 DISTNAME=		libtunepimp-0.5.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		ftp://ftp.musicbrainz.org/pub/musicbrainz/ \
 			http://ftp.musicbrainz.org/pub/musicbrainz/
@@ -32,6 +32,6 @@ pre-configure:
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../multimedia/mpeg4ip/buildlink3.mk"
+.include "../../multimedia/libmp4v2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"