- updated for 1.26

Changed files:
    faac-link.patch -> 1.4

diff --git a/faac-link.patch b/faac-link.patch
index 4015a1e4a3a3954f11b4f912da0c7e75edc94ba4..e329ecd8d0b89ff81018ff12ea5f27d8aa0ac335 100644 (file)
--- a/faac-link.patch
+++ b/faac-link.patch
@@ -1,31 +1,31 @@
 --- faac/frontend/Makefile.am.orig     2004-07-28 10:18:21.000000000 +0200
-+++ faac/frontend/Makefile.am  2006-08-23 23:19:38.375803500 +0200
++++ faac/frontend/Makefile.am  2007-11-04 11:26:06.598027652 +0100
 @@ -7,5 +7,9 @@
- LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++\r
- else\r
- INCLUDES = -I$(top_srcdir)/include \r
-+if WITH_EXT_MP4V2\r
-+LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm -lstdc++\r
-+else\r
- LDADD = $(top_builddir)/libfaac/libfaac.la -lm\r
- endif\r
-+endif\r
---- faac/configure.in.orig     2006-08-23 23:13:15.707888000 +0200
-+++ faac/configure.in  2006-08-23 23:18:43.204355500 +0200
-@@ -27,6 +27,7 @@
- AC_CHECK_LIB(gnugetopt, getopt_long)\r
- \r
- AM_CONDITIONAL(WITH_MP4V2, false)\r
-+AM_CONDITIONAL(WITH_EXT_MP4V2, false)\r
- \r
- AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],\r
-                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,\r
-@@ -35,6 +36,8 @@
- \r
- if test x$external_mp4v2 = xyes; then\r
-   AC_MSG_NOTICE([*** Building with external mp4v2 ***])\r
-+  AM_CONDITIONAL(WITH_EXT_MP4V2, true)\r
-+  MY_DEFINE(HAVE_LIBMP4V2)\r
- else\r
-   if test x$WITHMP4V2 = xyes; then\r
-      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])\r
+ LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
+ else
+ INCLUDES = -I$(top_srcdir)/include 
++if WITH_EXT_MP4V2
++LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm -lstdc++
++else
+ LDADD = $(top_builddir)/libfaac/libfaac.la -lm
+ endif
++endif
+--- faac/configure.in.orig     2007-08-20 20:03:22.000000000 +0200
++++ faac/configure.in  2007-11-04 11:20:45.451726567 +0100
+@@ -28,6 +28,7 @@
+ AC_CHECK_LIB(gnugetopt, getopt_long)
+ 
+ AM_CONDITIONAL(WITH_MP4V2, false)
++AM_CONDITIONAL(WITH_EXT_MP4V2, false)
+ 
+ AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
+                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
+@@ -36,6 +37,8 @@
+ 
+ if test x$external_mp4v2 = xyes; then
+   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
++  AM_CONDITIONAL(WITH_EXT_MP4V2, true)
++  MY_DEFINE(HAVE_LIBMP4V2)
+ else
+   if test x$WITHMP4V2 = xyes; then
+      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])