diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2010-08-11 20:58:04 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2010-08-11 20:58:04 +0000 |
| commit | 526f368c1f14049f2973cf1e394ac47f2b2b2a55 (patch) | |
| tree | adfab435172ba1503f50e9c1704611af679726b1 /audio/faac | |
| parent | 1e6350a694d411bf103551c336283d05c06e695e (diff) | |
| download | ports-526f368c1f14049f2973cf1e394ac47f2b2b2a55.tar.gz ports-526f368c1f14049f2973cf1e394ac47f2b2b2a55.zip | |
Chase multimedia/mp4v2 update.
PR: ports/148643
Submitted by: Christopher Key <cjk32 at cam.ac.uk>
Notes
Notes:
svn path=/head/; revision=259121
Diffstat (limited to 'audio/faac')
| -rw-r--r-- | audio/faac/Makefile | 6 | ||||
| -rw-r--r-- | audio/faac/files/patch-configure.in | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/audio/faac/Makefile b/audio/faac/Makefile index 24f13c210fb7..a01b24e80f63 100644 --- a/audio/faac/Makefile +++ b/audio/faac/Makefile @@ -7,13 +7,14 @@ PORTNAME= faac PORTVERSION= 1.28 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-${PORTVERSION} MAINTAINER= multimedia@FreeBSD.org COMMENT= MPEG-2 and MPEG-4 AAC audio encoder -LIB_DEPENDS= mp4v2.0:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 +LIB_DEPENDS= mp4v2.10:${PORTSDIR}/multimedia/mp4v2 RESTRICTED= Distribution in binary form is prohibited @@ -24,6 +25,7 @@ MAKE_JOBS_SAFE= yes USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22 ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing +CONFIGURE_ARGS= --with-mp4v2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ LIBS="-lmp4v2" @@ -35,6 +37,8 @@ MAN1= faac.1 post-patch: @${ECHO_CMD} "" >> ${WRKSRC}/libfaac/psych.h + @${REINPLACE_CMD} -e 's|<mp4\.h>|<mp4v2/mp4v2.h>|g' \ + ${WRKSRC}/frontend/main.c \ pre-configure: @cd ${WRKSRC}; ${SETENV} ${AUTOTOOLS_ENV} ${LIBTOOLIZE} --automake diff --git a/audio/faac/files/patch-configure.in b/audio/faac/files/patch-configure.in index 866cfe74f560..cc2b5fc2d6f8 100644 --- a/audio/faac/files/patch-configure.in +++ b/audio/faac/files/patch-configure.in @@ -1,15 +1,20 @@ ---- configure.in.orig Thu Aug 24 18:43:12 2006 -+++ configure.in Thu Aug 24 18:45:13 2006 +--- ./configure.in.orig 2010-07-11 22:10:12.000000000 +0100 ++++ ./configure.in 2010-07-11 22:10:49.000000000 +0100 @@ -1,7 +1,7 @@ AC_PREREQ(2.50) - AC_INIT(FAAC, 1.25, faac-dev@lists.sourceforge.net) + AC_INIT(FAAC, 1.28, faac-dev@lists.sourceforge.net) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE(faac, 1.25) AM_CONFIG_HEADER(config.h) -@@ -35,6 +35,7 @@ +@@ -32,10 +32,11 @@ + AC_CHECK_DECLS([MP4Create, MP4MetadataDelete], + AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes, + external_mp4v2=no, -lstdc++), +- external_mp4v2=no, [#include <mp4.h>]) ++ external_mp4v2=no, [#include <mp4v2/mp4v2.h>]) if test x$external_mp4v2 = xyes; then AC_MSG_NOTICE([*** Building with external mp4v2 ***]) |