-build against libmp4v2 instead of the full mpeg4ip

-update to 1.25 which contains small bug fixes according to the notes
-the most serious change seems to be that faac comes with an own copy
 of libmp4v2 now which it tries to use exclusively -- add some patches
 to still use an external lib (that's all optional, needed for tagging
 support)

6 files changed, 70 insertions, 30 deletions

diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index dbc8879c9bc..868ac9582c3 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:28:54 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/02/09 20:27:16 drochner Exp $
 #
 
-DISTNAME=	faac-1.24
-PKGREVISION=	1
+DISTNAME=	faac-1.25
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=faac/}
 
diff --git a/audio/faac/distinfo b/audio/faac/distinfo
index 2310551d8dd..e3bc77400e8 100644
--- a/audio/faac/distinfo
+++ b/audio/faac/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:44 agc Exp $
+$NetBSD: distinfo,v 1.4 2007/02/09 20:27:16 drochner Exp $
 
-SHA1 (faac-1.24.tar.gz) = fd79715a800f8b39470d5b312f5d843a2629dd49
-RMD160 (faac-1.24.tar.gz) = 7dbd8eec4f26875ea641b3319d8b970e68d88a60
-Size (faac-1.24.tar.gz) = 282585 bytes
-SHA1 (patch-aa) = 5ee567d2da600498f7e7685fc8a1eced60d2a6e5
+SHA1 (faac-1.25.tar.gz) = 482a0217362c50ce523ce5e165c5566e1a4a2a87
+RMD160 (faac-1.25.tar.gz) = 63a884775081e3d9a66dffaab341ed10e73365b8
+Size (faac-1.25.tar.gz) = 386608 bytes
+SHA1 (patch-aa) = fbb129223dd460b6b3c7a1f7ba9d1fc4d536b0df
+SHA1 (patch-ab) = 18f1573536d61ed4d4133119d199815ec7eeed21
+SHA1 (patch-ac) = 1f0332ac491dbc791ffab55a4b4555a2ee210f05
diff --git a/audio/faac/options.mk b/audio/faac/options.mk
index ebe4a8d1acc..252db93aa5e 100644
--- a/audio/faac/options.mk
+++ b/audio/faac/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2006/06/08 09:29:50 hira Exp $
+# $NetBSD: options.mk,v 1.4 2007/02/09 20:27:16 drochner Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.faac
 PKG_SUPPORTED_OPTIONS=		mpeg4ip
@@ -8,5 +8,8 @@ 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"
+.else
+# ignore bundled mp4v2 lib
+CONFIGURE_ARGS+= --without-mp4v2
 .endif
diff --git a/audio/faac/patches/patch-aa b/audio/faac/patches/patch-aa
index 679058e2c4f..d42ae6dfc29 100644
--- a/audio/faac/patches/patch-aa
+++ b/audio/faac/patches/patch-aa
@@ -1,22 +1,12 @@
-$NetBSD: patch-aa,v 1.2 2004/12/28 23:02:10 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2007/02/09 20:27:16 drochner Exp $
 
---- frontend/main.c.orig	2004-05-16 03:43:03.000000000 +0200
-+++ frontend/main.c	2004-05-16 03:44:22.000000000 +0200
-@@ -39,11 +39,16 @@
- #include <windows.h>
- #include <fcntl.h>
- #else
+--- frontend/main.c.orig	2004-12-08 12:07:17.000000000 +0100
++++ frontend/main.c
+@@ -39,6 +39,7 @@
+ #include <windows.h>

+ #include <fcntl.h>

+ #else

 +#include <sys/param.h>
- #include <signal.h>
- #endif
- 
--#if defined(__unix__) || defined(__APPLE__)
-+#if defined(__unix__) || defined(BSD) || defined(__APPLE__)
-+#ifdef __NetBSD__
-+#include <time.h>
-+#else
- #include <sys/time.h>
-+#endif
- #include <sys/resource.h>
- #include <unistd.h>
- #endif
+ #include <signal.h>

+ #endif

+ 

diff --git a/audio/faac/patches/patch-ab b/audio/faac/patches/patch-ab
new file mode 100644
index 00000000000..8c0d1a3bf9b
--- /dev/null
+++ b/audio/faac/patches/patch-ab
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1 2007/02/09 20:27:16 drochner Exp $
+
+--- configure.in.orig	2006-08-13 16:17:26.000000000 +0200
++++ configure.in
+@@ -27,6 +27,7 @@ AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE
+ AC_CHECK_LIB(gnugetopt, getopt_long)

+ 

+ AM_CONDITIONAL(WITH_MP4V2, false)

++AM_CONDITIONAL(WITH_EXTMP4V2, false)
+ 

+ AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],

+                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,

+@@ -35,6 +36,8 @@ AC_CHECK_DECLS([MP4Create, MP4MetadataDe
+ 

+ if test x$external_mp4v2 = xyes; then

+   AC_MSG_NOTICE([*** Building with external mp4v2 ***])

++  MY_DEFINE(HAVE_LIBMP4V2)
++  AM_CONDITIONAL(WITH_EXTMP4V2, true)
+ else

+   if test x$WITHMP4V2 = xyes; then

+      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])

+@@ -66,6 +69,6 @@ AC_CHECK_TYPES([in_port_t, socklen_t], ,
+ 	 #include <netinet/in.h>])

+ AC_CHECK_MEMBERS(fpos_t.__pos,,, [#include <stdio.h>])

+ 

+-AC_OUTPUT(common/Makefile common/mp4v2/Makefile \

+-          libfaac/Makefile frontend/Makefile \

++AC_OUTPUT(common/Makefile common/mp4v2/Makefile
++          libfaac/Makefile frontend/Makefile
+           include/Makefile Makefile)

diff --git a/audio/faac/patches/patch-ac b/audio/faac/patches/patch-ac
new file mode 100644
index 00000000000..0be974f4a0c
--- /dev/null
+++ b/audio/faac/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2007/02/09 20:27:16 drochner Exp $
+
+--- frontend/Makefile.am.orig	2007-02-09 17:32:03.000000000 +0100
++++ frontend/Makefile.am
+@@ -6,6 +6,11 @@ if WITH_MP4V2

+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2

+ LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++

+ else

++if WITH_EXTMP4V2
++INCLUDES = -I$(top_srcdir)/include
++LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm
++else
+ INCLUDES = -I$(top_srcdir)/include 

+ LDADD = $(top_builddir)/libfaac/libfaac.la -lm

++endif
+ endif