update to faad-2.10.1, from Brad

patch libquicktime's configure script to fix detection

audio/faad/Makefile

@@ -3,18 +3,15 @@ NOT_FOR_ARCHS=	${GCC3_ARCHS}
 
 COMMENT=	MPEG-2 and MPEG-4 AAC decoder
 
-V=		2.7
+V=		2.10.1
-DISTNAME=	faad2-${V}
+GH_ACCOUNT=	knik0
+GH_PROJECT=	faad2
+GH_TAGNAME=	${V}
 PKGNAME=	faad-${V}
-REVISION=	2
 CATEGORIES=    	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=faac/}
-EXTRACT_SUFX=	.tar.bz2
 
-SHARED_LIBS=	faad	3.0 \
+SHARED_LIBS=	faad		4.0 \
-		mp4ff	2.0
+		faad_drm	0.0
-
-HOMEPAGE=	http://www.audiocoding.com/
 
 # GPLv2+
 PERMIT_PACKAGE=	Yes
@@ -26,17 +23,9 @@ BUILD_DEPENDS+=	${MODGNU_AUTOCONF_DEPENDS} \
 		${MODGNU_AUTOMAKE_DEPENDS} \
 		devel/libtool
 
-USE_GMAKE=	Yes
+AUTOCONF_VERSION= 2.71
-CONFIGURE_STYLE= gnu
+AUTOMAKE_VERSION= 1.16
-AUTOCONF_VERSION= 2.61
+AUTORECONF=	./bootstrap
-AUTOMAKE_VERSION= 1.9
+CONFIGURE_STYLE= autoreconf
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-post-extract:
-	@mv ${WRKSRC}/frontend/faad.man ${WRKSRC}/frontend/faad.1
-
-post-patch:
-	@cd ${WRKSRC} && ${AUTOCONF_ENV} sh bootstrap
 
 .include <bsd.port.mk>

audio/faad/distinfo

@@ -1,2 +1,2 @@
-SHA256 (faad2-2.7.tar.bz2) = FFYbXWvEV+glv9OSGuUKZkjzd6k5bq8W1LBXs5o/Y7U=
+SHA256 (faad2-2.10.1.tar.gz) = TBbHEpXKDL98Pf6Y6xHY+o0KwwQuQWBM/WzBGkCM8mQ=
-SIZE (faad2-2.7.tar.bz2) = 901043
+SIZE (faad2-2.10.1.tar.gz) = 803488

audio/faad/patches/patch-common_mp4ff_Makefile_am

@@ -1,13 +0,0 @@
---- common/mp4ff/Makefile.am.orig	Fri Feb  6 09:24:21 2009
-+++ common/mp4ff/Makefile.am	Thu May 10 19:02:20 2012
-@@ -1,7 +1,7 @@
--lib_LIBRARIES = libmp4ff.a
-+lib_LTLIBRARIES = libmp4ff.la
- include_HEADERS = mp4ff.h mp4ffint.h
- 
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
- 
--libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
- 		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h

audio/faad/patches/patch-common_mp4ff_mp4ff_h

@@ -1,14 +0,0 @@
---- common/mp4ff/mp4ff.h.orig	Mon May 14 17:05:03 2012
-+++ common/mp4ff/mp4ff.h	Mon May 14 17:05:27 2012
-@@ -35,11 +35,7 @@
- extern "C" {
- #endif /* __cplusplus */
- 
--#ifdef HAVE_STDINT_H
- #include <stdint.h>
--#else
--#include "mp4ff_int_types.h"
--#endif
- 
- /* file callback structure */
- typedef struct

audio/faad/patches/patch-common_mp4ff_mp4ffint_h

@@ -1,11 +0,0 @@
---- common/mp4ff/mp4ffint.h.orig	Mon May 14 17:06:54 2012
-+++ common/mp4ff/mp4ffint.h	Mon May 14 17:07:25 2012
-@@ -35,7 +35,7 @@
- extern "C" {
- #endif /* __cplusplus */
- 
--#include "mp4ff_int_types.h"
-+#include <stdint.h>
- #include <stdlib.h>
- 
- #define MAX_TRACKS 1024

audio/faad/patches/patch-frontend_Makefile_am

@@ -1,18 +0,0 @@
---- frontend/Makefile.am.orig	Fri Feb  6 11:03:37 2009
-+++ frontend/Makefile.am	Mon May 14 16:55:55 2012
-@@ -1,12 +1,11 @@
- bin_PROGRAMS = faad
--man_MANS = faad.man
-+man_MANS = faad.1
- 
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
- 	   -I$(top_srcdir)/common/mp4ff
- 
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
--	     $(top_builddir)/common/mp4ff/libmp4ff.a
-+	     $(top_builddir)/common/mp4ff/libmp4ff.la
- 
- faad_SOURCES = main.c \
--	       audio.c audio.h \
--	       $(top_srcdir)/common/faad/getopt.c
-+	       audio.c audio.h

audio/faad/pkg/PLIST

@@ -5,13 +5,12 @@
 @pkgpath audio/faad,-xmms
 @bin bin/faad
 include/faad.h
-include/mp4ff.h
-include/mp4ffint.h
 include/neaacdec.h
-lib/libfaad.a
+@static-lib lib/libfaad.a
 lib/libfaad.la
 @lib lib/libfaad.so.${LIBfaad_VERSION}
-lib/libmp4ff.a
+@static-lib lib/libfaad_drm.a
-lib/libmp4ff.la
+lib/libfaad_drm.la
-@lib lib/libmp4ff.so.${LIBmp4ff_VERSION}
+@lib lib/libfaad_drm.so.${LIBfaad_drm_VERSION}
+lib/pkgconfig/faad2.pc
 @man man/man1/faad.1

multimedia/libquicktime/patches/patch-configure

@@ -1,23 +1,13 @@
---- configure.orig	Thu Mar 29 15:45:15 2012
+Fix detection of newer faad.
-+++ configure	Mon Apr  2 19:49:37 2012
+
-@@ -14951,7 +14951,7 @@ fi
+Index: configure
-     VORBIS_LIBS="-L$prefix/lib"
+--- configure.orig
-   fi
++++ configure
+@@ -17588,6 +17588,7 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--  VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
++    #include <faad.h>
-+  VORBIS_LIBS="$VORBIS_LIBS -lvorbis -logg -lm"
+     #include <neaacdec.h>
-   VORBISFILE_LIBS="-lvorbisfile"
+     #include <stdio.h>
-   VORBISENC_LIBS="-lvorbisenc"
+     main()
- 
-@@ -15111,11 +15111,7 @@ if test "x$with_lame" != "xno"; then
- OLD_CFLAGS=$CFLAGS
- OLD_LIBS=$LIBS
- 
--if test x$have_vorbis = xtrue; then
--LIBS="$LIBS -lmp3lame -lvorbis -lm"
--else
- LIBS="$LIBS -lmp3lame -lm"
--fi
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lame" >&5