Contents of /trunk/libfaac/patches/libfaac-1.28-external-libmp4v2.patch
Parent Directory | Revision Log
Revision 1121 -
(show annotations)
(download)
Mon Sep 6 20:33:40 2010 UTC (14 years ago) by niro
File size: 1766 byte(s)
Mon Sep 6 20:33:40 2010 UTC (14 years ago) by niro
File size: 1766 byte(s)
patch to use external libmp4v2
1 | diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in |
2 | --- faac-1.28.orig/configure.in 2009-02-05 02:55:38.000000000 +0200 |
3 | +++ faac-1.28/configure.in 2009-07-10 13:21:34.000000000 +0300 |
4 | @@ -28,14 +28,17 @@ |
5 | AC_CHECK_LIB(gnugetopt, getopt_long) |
6 | |
7 | AM_CONDITIONAL(WITH_MP4V2, false) |
8 | +AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false) |
9 | |
10 | AC_CHECK_DECLS([MP4Create, MP4MetadataDelete], |
11 | AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes, |
12 | external_mp4v2=no, -lstdc++), |
13 | - external_mp4v2=no, [#include <mp4.h>]) |
14 | + external_mp4v2=no, [#include <mp4v2/mp4v2.h>]) |
15 | |
16 | if test x$external_mp4v2 = xyes; then |
17 | AC_MSG_NOTICE([*** Building with external mp4v2 ***]) |
18 | + MY_DEFINE(HAVE_LIBMP4V2) |
19 | + AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true) |
20 | else |
21 | if test x$WITHMP4V2 = xyes; then |
22 | AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) |
23 | diff -ur faac-1.28.orig/frontend/main.c faac-1.28/frontend/main.c |
24 | --- faac-1.28.orig/frontend/main.c 2009-01-24 03:10:20.000000000 +0200 |
25 | +++ faac-1.28/frontend/main.c 2009-07-10 13:22:18.000000000 +0300 |
26 | @@ -30,7 +30,7 @@ |
27 | #endif |
28 | |
29 | #ifdef HAVE_LIBMP4V2 |
30 | -# include <mp4.h> |
31 | +# include <mp4v2/mp4v2.h> |
32 | #endif |
33 | |
34 | #define DEFAULT_TNS 0 |
35 | diff -ur faac-1.28.orig/frontend/Makefile.am faac-1.28/frontend/Makefile.am |
36 | --- faac-1.28.orig/frontend/Makefile.am 2008-12-16 02:56:00.000000000 +0200 |
37 | +++ faac-1.28/frontend/Makefile.am 2009-07-10 13:21:55.000000000 +0300 |
38 | @@ -8,5 +8,9 @@ |
39 | LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ |
40 | else |
41 | INCLUDES = -I$(top_srcdir)/include |
42 | +if WITH_EXTERNAL_MP4V2 |
43 | +LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2 |
44 | +else |
45 | LDADD = $(top_builddir)/libfaac/libfaac.la -lm |
46 | endif |
47 | +endif |