diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-07-10 10:23:17 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-07-10 10:23:17 +0000 |
| commit | 8af5c38ab272bf7ab2af9492770cad9a362089d4 (patch) | |
| tree | 946642fceb5201742fc728eb264dc1b0a683b2ad /media-libs/faac/files | |
| parent | New revision of faac for libmp4v2. (diff) | |
| download | gentoo-2-8af5c38ab272bf7ab2af9492770cad9a362089d4.tar.gz gentoo-2-8af5c38ab272bf7ab2af9492770cad9a362089d4.tar.bz2 gentoo-2-8af5c38ab272bf7ab2af9492770cad9a362089d4.zip | |
Revision bump for >= libmp4v2 1.9.0.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/faac/files')
| -rw-r--r-- | media-libs/faac/files/faac-1.28-external-libmp4v2.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/media-libs/faac/files/faac-1.28-external-libmp4v2.patch b/media-libs/faac/files/faac-1.28-external-libmp4v2.patch new file mode 100644 index 000000000000..54a63347b87a --- /dev/null +++ b/media-libs/faac/files/faac-1.28-external-libmp4v2.patch @@ -0,0 +1,47 @@ +diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in +--- faac-1.28.orig/configure.in 2009-02-05 02:55:38.000000000 +0200 ++++ faac-1.28/configure.in 2009-07-10 13:21:34.000000000 +0300 +@@ -28,14 +28,17 @@ + AC_CHECK_LIB(gnugetopt, getopt_long) + + AM_CONDITIONAL(WITH_MP4V2, false) ++AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false) + + 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 ***]) ++ MY_DEFINE(HAVE_LIBMP4V2) ++ AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true) + else + if test x$WITHMP4V2 = xyes; then + AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) +diff -ur faac-1.28.orig/frontend/main.c faac-1.28/frontend/main.c +--- faac-1.28.orig/frontend/main.c 2009-01-24 03:10:20.000000000 +0200 ++++ faac-1.28/frontend/main.c 2009-07-10 13:22:18.000000000 +0300 +@@ -30,7 +30,7 @@ + #endif + + #ifdef HAVE_LIBMP4V2 +-# include <mp4.h> ++# include <mp4v2/mp4v2.h> + #endif + + #define DEFAULT_TNS 0 +diff -ur faac-1.28.orig/frontend/Makefile.am faac-1.28/frontend/Makefile.am +--- faac-1.28.orig/frontend/Makefile.am 2008-12-16 02:56:00.000000000 +0200 ++++ faac-1.28/frontend/Makefile.am 2009-07-10 13:21:55.000000000 +0300 +@@ -8,5 +8,9 @@ + LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ + else + INCLUDES = -I$(top_srcdir)/include ++if WITH_EXTERNAL_MP4V2 ++LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2 ++else + LDADD = $(top_builddir)/libfaac/libfaac.la -lm + endif ++endif |