| 1 |
ssuominen 09/07/10 10:23:17 |
| 2 |
|
| 3 |
Added: faac-1.28-external-libmp4v2.patch |
| 4 |
Log: |
| 5 |
Revision bump for >= libmp4v2 1.9.0. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-libs/faac/files/faac-1.28-external-libmp4v2.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/faac/files/faac-1.28-external-libmp4v2.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/faac/files/faac-1.28-external-libmp4v2.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: faac-1.28-external-libmp4v2.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in |
| 17 |
--- faac-1.28.orig/configure.in 2009-02-05 02:55:38.000000000 +0200 |
| 18 |
+++ faac-1.28/configure.in 2009-07-10 13:21:34.000000000 +0300 |
| 19 |
@@ -28,14 +28,17 @@ |
| 20 |
AC_CHECK_LIB(gnugetopt, getopt_long) |
| 21 |
|
| 22 |
AM_CONDITIONAL(WITH_MP4V2, false) |
| 23 |
+AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false) |
| 24 |
|
| 25 |
AC_CHECK_DECLS([MP4Create, MP4MetadataDelete], |
| 26 |
AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes, |
| 27 |
external_mp4v2=no, -lstdc++), |
| 28 |
- external_mp4v2=no, [#include <mp4.h>]) |
| 29 |
+ external_mp4v2=no, [#include <mp4v2/mp4v2.h>]) |
| 30 |
|
| 31 |
if test x$external_mp4v2 = xyes; then |
| 32 |
AC_MSG_NOTICE([*** Building with external mp4v2 ***]) |
| 33 |
+ MY_DEFINE(HAVE_LIBMP4V2) |
| 34 |
+ AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true) |
| 35 |
else |
| 36 |
if test x$WITHMP4V2 = xyes; then |
| 37 |
AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) |
| 38 |
diff -ur faac-1.28.orig/frontend/main.c faac-1.28/frontend/main.c |
| 39 |
--- faac-1.28.orig/frontend/main.c 2009-01-24 03:10:20.000000000 +0200 |
| 40 |
+++ faac-1.28/frontend/main.c 2009-07-10 13:22:18.000000000 +0300 |
| 41 |
@@ -30,7 +30,7 @@ |
| 42 |
#endif |
| 43 |
|
| 44 |
#ifdef HAVE_LIBMP4V2 |
| 45 |
-# include <mp4.h> |
| 46 |
+# include <mp4v2/mp4v2.h> |
| 47 |
#endif |
| 48 |
|
| 49 |
#define DEFAULT_TNS 0 |
| 50 |
diff -ur faac-1.28.orig/frontend/Makefile.am faac-1.28/frontend/Makefile.am |
| 51 |
--- faac-1.28.orig/frontend/Makefile.am 2008-12-16 02:56:00.000000000 +0200 |
| 52 |
+++ faac-1.28/frontend/Makefile.am 2009-07-10 13:21:55.000000000 +0300 |
| 53 |
@@ -8,5 +8,9 @@ |
| 54 |
LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++ |
| 55 |
else |
| 56 |
INCLUDES = -I$(top_srcdir)/include |
| 57 |
+if WITH_EXTERNAL_MP4V2 |
| 58 |
+LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2 |
| 59 |
+else |
| 60 |
LDADD = $(top_builddir)/libfaac/libfaac.la -lm |
| 61 |
endif |
| 62 |
+endif |
Archives