Attachment #108843 for bug #149765

View | Details | Raw Unified | Return to bug 149765
Collapse All | Expand All

Lines 25-34 Link Here

(-)/usr/ports/audio/faac/Makefile (-3 / +2 lines)
25	USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22	25	USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22
26	ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal	26	ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal
27	AUTOMAKE_ARGS= --add-missing	27	AUTOMAKE_ARGS= --add-missing
28	CONFIGURE_ARGS= --with-mp4v2	28	CONFIGURE_ARGS= --with-mp4v2
29	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	29	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
30	LDFLAGS="-L${LOCALBASE}/lib" \	30	LDFLAGS="-L${LOCALBASE}/lib"
31	LIBS="-lmp4v2"
32	USE_LDCONFIG= yes	31	USE_LDCONFIG= yes
33		32
34	MAN1= faac.1	33	MAN1= faac.1

Lines 1-5 Link Here

(-)/usr/ports/audio/faac/files/patch-configure.in (-3 / +9 lines)
1	--- ./configure.in.orig 2010-07-11 22:10:12.000000000 +0100	1	--- configure.in.orig 2010-08-18 15:41:30.584845747 +0300
2	+++ ./configure.in 2010-07-11 22:10:49.000000000 +0100	2	+++ configure.in 2010-08-18 15:42:51.184443581 +0300
3	@@ -1,7 +1,7 @@	3	@@ -1,7 +1,7 @@
4	AC_PREREQ(2.50)	4	AC_PREREQ(2.50)
5	AC_INIT(FAAC, 1.28, faac-dev@lists.sourceforge.net)	5	AC_INIT(FAAC, 1.28, faac-dev@lists.sourceforge.net)
Lines 9-15 Link Here
9		9
10	AM_CONFIG_HEADER(config.h)	10	AM_CONFIG_HEADER(config.h)
11		11
12	@@ -32,10 +32,11 @@	12	@@ -28,14 +28,17 @@ AC_CHECK_DECL(strcasecmp, MY_DEFINE(HAVE
		13	AC_CHECK_LIB(gnugetopt, getopt_long)
		14
		15	AM_CONDITIONAL(WITH_MP4V2, false)
		16	+AM_CONDITIONAL(WITH_EXT_MP4V2, false)
		17
13	AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],	18	AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
14	AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,	19	AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
15	external_mp4v2=no, -lstdc++),	20	external_mp4v2=no, -lstdc++),
Lines 18-23 Link Here
18		23
19	if test x$external_mp4v2 = xyes; then	24	if test x$external_mp4v2 = xyes; then
20	AC_MSG_NOTICE([* Building with external mp4v2 *])	25	AC_MSG_NOTICE([* Building with external mp4v2 *])
		26	+ AM_CONDITIONAL(WITH_EXT_MP4V2, true)
21	+ MY_DEFINE(HAVE_LIBMP4V2)	27	+ MY_DEFINE(HAVE_LIBMP4V2)
22	else	28	else
23	if test x$WITHMP4V2 = xyes; then	29	if test x$WITHMP4V2 = xyes; then




--- frontend/Makefile.am.orig	2010-08-18 15:43:04.246728673 +0300
+++ frontend/Makefile.am	2010-08-18 15:45:44.922966543 +0300
@@ -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_EXT_MP4V2
+INCLUDES = -I$(top_srcdir)/include 
+LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm -lstdc++
+else
 INCLUDES = -I$(top_srcdir)/include 
 LDADD = $(top_builddir)/libfaac/libfaac.la -lm
 endif
+endif

Return to bug 149765

Line 0 Link Here

(-)/usr/ports/audio/faac/files/patch-frontend_Makefile.am (+14 lines)
	1	--- frontend/Makefile.am.orig 2010-08-18 15:43:04.246728673 +0300
	2	+++ frontend/Makefile.am 2010-08-18 15:45:44.922966543 +0300
	3	@@ -7,6 +7,11 @@ if WITH_MP4V2
	4	INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
	5	LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
	6	else
	7	+if WITH_EXT_MP4V2
	8	+INCLUDES = -I$(top_srcdir)/include
	9	+LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm -lstdc++
	10	+else
	11	INCLUDES = -I$(top_srcdir)/include
	12	LDADD = $(top_builddir)/libfaac/libfaac.la -lm
	13	endif
	14	+endif