update to 1.28

changes:
Prevent out of range scalefactors
Updated to latest mpeg4ip mp4 file format library
Added -s option to make the encoder output optimized mp4 layout
Improved JPEG detection for album art
Lot's of compilation issues solved

6 files changed, 46 insertions, 56 deletions

diff --git a/audio/faac/Makefile b/audio/faac/Makefile
index ac4fd190865..1795c64c7ee 100644
--- a/audio/faac/Makefile
+++ b/audio/faac/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2009/08/05 11:22:38 ahoka Exp $
+# $NetBSD: Makefile,v 1.11 2009/09/09 16:40:39 drochner Exp $
 #
 
-DISTNAME=	faac-1.25
-PKGREVISION=	1
+DISTNAME=	faac-1.28
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=faac/}
 
@@ -10,7 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.audiocoding.com/
 COMMENT=	AAC audio encoder
 
-RESTRICTED=		This software may require the payment of patent royalties
+RESTRICTED=	This software may require the payment of patent royalties
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
@@ -19,7 +18,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LIBTOOL=	yes
 USE_TOOLS+=	automake
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/faac
 
 LIBTOOLIZE=	${PREFIX}/bin/libtoolize
 
diff --git a/audio/faac/PLIST b/audio/faac/PLIST
index fbe837dce1e..7e738ac59b9 100644
--- a/audio/faac/PLIST
+++ b/audio/faac/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/09/09 16:40:39 drochner Exp $
 bin/faac
 include/faac.h
 include/faaccfg.h
 lib/libfaac.la
+man/man1/faac.1
diff --git a/audio/faac/distinfo b/audio/faac/distinfo
index d9627b74dd5..fcee3b49bba 100644
--- a/audio/faac/distinfo
+++ b/audio/faac/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2007/02/15 06:44:32 tron Exp $
+$NetBSD: distinfo,v 1.6 2009/09/09 16:40:39 drochner Exp $
 
-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) = 072259985b81c866102cbfedd4590129cd722d38
+SHA1 (faac-1.28.tar.gz) = d00b023a3642f81bb1fb13d962a65079121396ee
+RMD160 (faac-1.28.tar.gz) = 03902393488f04223aabdc804bfe77bb32a61c94
+Size (faac-1.28.tar.gz) = 678891 bytes
+SHA1 (patch-aa) = 5d3fa0d38721146aa3131b555ee4f1172ce119c4
+SHA1 (patch-ab) = 9598e987fc3cbde5923236e5264cb176f84c3ba6
+SHA1 (patch-ac) = feabc1f1ecbd98b6257184013a8785598e7ffa6a
diff --git a/audio/faac/patches/patch-aa b/audio/faac/patches/patch-aa
index d42ae6dfc29..7b6bfc5097b 100644
--- a/audio/faac/patches/patch-aa
+++ b/audio/faac/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2007/02/09 20:27:16 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2009/09/09 16:40:39 drochner Exp $
 
---- frontend/main.c.orig	2004-12-08 12:07:17.000000000 +0100
+--- frontend/main.c.orig	2009-01-24 02:10:20.000000000 +0100
 +++ frontend/main.c
 @@ -39,6 +39,7 @@
- #include <windows.h>

- #include <fcntl.h>

- #else

+ #include <windows.h>
+ #include <fcntl.h>
+ #else
 +#include <sys/param.h>
- #include <signal.h>

- #endif

- 

+ #include <signal.h>
+ #endif
+ 
diff --git a/audio/faac/patches/patch-ab b/audio/faac/patches/patch-ab
index 8c0d1a3bf9b..9d75e4d8c1a 100644
--- a/audio/faac/patches/patch-ab
+++ b/audio/faac/patches/patch-ab
@@ -1,30 +1,21 @@
-$NetBSD: patch-ab,v 1.1 2007/02/09 20:27:16 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2009/09/09 16:40:39 drochner Exp $
 
---- configure.in.orig	2006-08-13 16:17:26.000000000 +0200
+--- configure.in.orig	2009-02-05 01:55:38.000000000 +0100
 +++ configure.in
-@@ -27,6 +27,7 @@ AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE
- AC_CHECK_LIB(gnugetopt, getopt_long)

- 

- AM_CONDITIONAL(WITH_MP4V2, false)

+@@ -28,6 +28,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 ***])

+ 
+ AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
+                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
+@@ -36,6 +37,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)

+ else
+   if test x$WITHMP4V2 = xyes; then
+      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
diff --git a/audio/faac/patches/patch-ac b/audio/faac/patches/patch-ac
index 9e93ecbc6f2..1538a03b9e7 100644
--- a/audio/faac/patches/patch-ac
+++ b/audio/faac/patches/patch-ac
@@ -1,16 +1,16 @@
-$NetBSD: patch-ac,v 1.2 2007/02/15 06:44:32 tron Exp $
+$NetBSD: patch-ac,v 1.3 2009/09/09 16:40:39 drochner Exp $
 
---- frontend/Makefile.am.orig	2004-07-28 09:18:21.000000000 +0100
-+++ frontend/Makefile.am	2007-02-12 09:03:04.000000000 +0000
-@@ -6,6 +6,11 @@
- 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

+--- frontend/Makefile.am.orig	2008-12-16 01:56:00.000000000 +0100
++++ frontend/Makefile.am
+@@ -7,6 +7,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.a -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

+ INCLUDES = -I$(top_srcdir)/include 
+ LDADD = $(top_builddir)/libfaac/libfaac.la -lm
+ endif
 +endif
- endif