Contents of /trunk/libfaad2/patches/libfaad2-2.0-mpeg4ip.patch
Parent Directory | Revision Log
Revision 144 -
(show annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 3086 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 3086 byte(s)
-import
1 | This patch make sure that the internal libmp4v2 is not built, and mpeg4ip is |
2 | used instead. |
3 | It also disables mpeg4ip plugin as version 1.4.1 is incompatible with it. |
4 | |
5 | Note: this patch is now updated to remove the requirement of libmp4v2 when |
6 | building the xmms plugin. |
7 | |
8 | Index: faad2/configure.in |
9 | =================================================================== |
10 | --- faad2.orig/configure.in |
11 | +++ faad2/configure.in |
12 | @@ -19,8 +19,6 @@ AC_ARG_WITH( xmms, [ --with-xmms |
13 | |
14 | AC_ARG_WITH( drm, [ --with-drm compile libfaad with DRM support],WITHDRM=$withval, WITHDRM=no) |
15 | |
16 | -AC_ARG_WITH( mp4v2, [ --with-mp4v2 compile libmp4v2],WITHMP4V2=$withval, WITHMP4V2=no) |
17 | - |
18 | dnl Checks for header files required for mp4.h |
19 | AC_HEADER_STDC |
20 | AC_CHECK_HEADERS(stdint.h inttypes.h) |
21 | @@ -66,26 +64,8 @@ MY_CHECK_TYPEDEF_FROM_INCLUDE([fpos_t fo |
22 | [#include <stdio.h>], |
23 | [HAVE_FPOS_T_POS]) |
24 | |
25 | - |
26 | -AC_CHECK_PROG(external_mp4v2, mpeg4ip-config, yes, no) |
27 | -AC_CHECK_LIB(mp4v2, MP4Create, , external_mp4v2=no, -lstdc++) |
28 | -AC_CHECK_LIB(mp4v2, MP4MetadataDelete, , external_mp4v2=no, -lstdc++) |
29 | -AC_CHECK_HEADER(mp4.h, , external_mp4v2=no) |
30 | - |
31 | AM_CONDITIONAL(WITH_MP4V2, false) |
32 | - |
33 | -if test x$external_mp4v2 = xyes; then |
34 | - AM_CONDITIONAL(HAVE_MPEG4IP, true) |
35 | - MPEG4IP_PLAYER_PLUGIN_DIR=`mpeg4ip-config --player-plugin-dir` |
36 | - AC_SUBST(MPEG4IP_PLAYER_PLUGIN_DIR) |
37 | - AC_MSG_NOTICE([*** Building with external mp4v2 ***]) |
38 | -else |
39 | - AC_MSG_NOTICE([*** Building with internal mp4v2 ***]) |
40 | - AM_CONDITIONAL(HAVE_MPEG4IP, false) |
41 | - if test x$WITHMP4V2 = xyes; then |
42 | - AM_CONDITIONAL(WITH_MP4V2, true) |
43 | - fi |
44 | -fi |
45 | +AM_CONDITIONAL(HAVE_MPEG4IP, false) |
46 | |
47 | if test x$WITHXMMS = xyes; then |
48 | AC_CHECK_PROGS(XMMS_CONFIG, xmms-config,"not_found") |
49 | @@ -102,8 +82,6 @@ if test x$WITHXMMS = xyes; then |
50 | fi |
51 | |
52 | AM_CONDITIONAL(HAVE_XMMS, true) |
53 | - AC_MSG_NOTICE("xmms plugin requires libmp4v2 to be build") |
54 | - AM_CONDITIONAL(WITH_MP4V2, true) |
55 | AC_CONFIG_FILES(plugins/xmms/Makefile plugins/xmms/src/Makefile) |
56 | else |
57 | AC_MSG_NOTICE(no xmms build configured) |
58 | Index: faad2/plugins/xmms/src/Makefile.am |
59 | =================================================================== |
60 | --- faad2.orig/plugins/xmms/src/Makefile.am |
61 | +++ faad2/plugins/xmms/src/Makefile.am |
62 | @@ -3,10 +3,10 @@ lib_LTLIBRARIES = libmp4.la |
63 | |
64 | libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall \ |
65 | `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \ |
66 | - -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2 |
67 | + -I$(top_srcdir)/include |
68 | |
69 | libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \ |
70 | - $(top_builddir)/common/mp4v2/libmp4v2.la |
71 | + -lmp4v2 |
72 | |
73 | libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \ |
74 | `$(GTK_CONFIG) --libs` -lpthread -lstdc++ |
75 | Index: faad2/plugins/xmms/src/libmp4.c |
76 | =================================================================== |
77 | --- faad2.orig/plugins/xmms/src/libmp4.c |
78 | +++ faad2/plugins/xmms/src/libmp4.c |
79 | @@ -9,7 +9,7 @@ |
80 | #include <pthread.h> |
81 | #include <gtk/gtk.h> |
82 | #include "faad.h" |
83 | -#include "mp4.h" |
84 | +#include <mp4.h> |
85 | |
86 | #include <xmms/plugin.h> |
87 | #include <xmms/util.h> |