faac-1.28-external-libmp4v2.patch 1.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  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. AM_CONDITIONAL(WITH_MP4V2, false)
  7. +AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false)
  8. AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
  9. AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
  10. external_mp4v2=no, -lstdc++),
  11. - external_mp4v2=no, [#include <mp4.h>])
  12. + external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
  13. if test x$external_mp4v2 = xyes; then
  14. AC_MSG_NOTICE([*** Building with external mp4v2 ***])
  15. + MY_DEFINE(HAVE_LIBMP4V2)
  16. + AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true)
  17. else
  18. if test x$WITHMP4V2 = xyes; then
  19. AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
  20. diff -ur faac-1.28.orig/frontend/main.c faac-1.28/frontend/main.c
  21. --- faac-1.28.orig/frontend/main.c 2009-01-24 03:10:20.000000000 +0200
  22. +++ faac-1.28/frontend/main.c 2009-07-10 13:22:18.000000000 +0300
  23. @@ -30,7 +30,7 @@
  24. #endif
  25. #ifdef HAVE_LIBMP4V2
  26. -# include <mp4.h>
  27. +# include <mp4v2/mp4v2.h>
  28. #endif
  29. #define DEFAULT_TNS 0
  30. diff -ur faac-1.28.orig/frontend/Makefile.am faac-1.28/frontend/Makefile.am
  31. --- faac-1.28.orig/frontend/Makefile.am 2008-12-16 02:56:00.000000000 +0200
  32. +++ faac-1.28/frontend/Makefile.am 2009-07-10 13:21:55.000000000 +0300
  33. @@ -8,5 +8,9 @@
  34. LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
  35. else
  36. INCLUDES = -I$(top_srcdir)/include
  37. +if WITH_EXTERNAL_MP4V2
  38. +LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
  39. +else
  40. LDADD = $(top_builddir)/libfaac/libfaac.la -lm
  41. endif
  42. +endif