Contents of /trunk/avidemux/patches/avidemux-2.3.0-external-twolame.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: 4048 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 4048 byte(s)
-import
1 | diff -u -r avidemux_2.3.0.old/avidemux/ADM_audiofilter/audioencoder_twolame.cpp avidemux_2.3.0/avidemux/ADM_audiofilter/audioencoder_twolame.cpp |
2 | --- avidemux_2.3.0.old/avidemux/ADM_audiofilter/audioencoder_twolame.cpp 2007-02-03 23:41:05.000000000 +0100 |
3 | +++ avidemux_2.3.0/avidemux/ADM_audiofilter/audioencoder_twolame.cpp 2007-02-03 23:41:19.000000000 +0100 |
4 | @@ -30,7 +30,7 @@ |
5 | |
6 | extern "C" |
7 | { |
8 | -#include "libtoolame/twolame.h" |
9 | +#include <twolame.h> |
10 | } |
11 | #include "ADM_toolkit/ADM_debugID.h" |
12 | #define MODULE_NAME MODULE_AUDIO_FILTER |
13 | diff -u -r avidemux_2.3.0.old/avidemux/Makefile.am avidemux_2.3.0/avidemux/Makefile.am |
14 | --- avidemux_2.3.0.old/avidemux/Makefile.am 2007-02-03 23:41:05.000000000 +0100 |
15 | +++ avidemux_2.3.0/avidemux/Makefile.am 2007-02-03 23:41:19.000000000 +0100 |
16 | @@ -17,10 +17,11 @@ |
17 | ADM_colorspace ADM_editor ADM_encoder ADM_filter ADM_inpics ADM_nuv \ |
18 | ADM_toolkit oplug_mpeg xpm ADM_video oplug_avi ADM_audiodevice ADM_vp32 \ |
19 | libMpeg2Dec oplug_mpegFF ADM_h263 ADM_gui2 ADM_dialog \ |
20 | - ADM_ogm ADM_3gp mpeg2enc ADM_openDML ADM_lvemux libtoolame ADM_requant \ |
21 | + ADM_ogm ADM_3gp mpeg2enc ADM_openDML ADM_lvemux ADM_requant \ |
22 | ADM_script oplug_ogm ADM_xvidratectl ADM_mplex ADM_ocr ADM_libswscale \ |
23 | ADM_mpegdemuxer ADM_tray ADM_lavutil ADM_lavformat ADM_lavcodec oplug_mp4 \ |
24 | - ADM_avsproxy ADM_liba52 ADM_libMad ADM_matroska ADM_asf |
25 | + ADM_avsproxy ADM_liba52 ADM_libMad ADM_matroska ADM_asf \ |
26 | + $(TWOLAME_DIR) |
27 | |
28 | if HAVE_FREETYPE |
29 | SUBDIRS += libass |
30 | @@ -63,7 +64,6 @@ |
31 | ./ADM_video/libADM_video.a ./ADM_encoder/libADM_encoder.a \ |
32 | ./ADM_codecs/libADM_codecs.a ./ADM_vp32/libADM_vp32.a \ |
33 | ./ADM_audiofilter/libADM_audiofilter.a \ |
34 | -./libtoolame/liblibtoolame.a \ |
35 | ./ADM_gui2/libADM_gui2.a \ |
36 | ./ADM_libswscale/libswscale.a \ |
37 | ./mpeg2enc/libmpeg2enc.a \ |
38 | @@ -91,17 +91,19 @@ |
39 | ./ADM_library/libADM_library.a \ |
40 | ./ADM_toolkit/libADM_toolkit.a \ |
41 | ./libass/libass.a \ |
42 | -$(libmpeg2enc_Altivec) |
43 | +$(libmpeg2enc_Altivec) \ |
44 | +$(TWOLAME_LIBS) |
45 | |
46 | |
47 | INCLUDES = $(all_includes) $(GTK_CFLAGS) $(XML_CFLAGS) \ |
48 | $(SMONKEY_CFLAGS) \ |
49 | -DADMLOCALE='"'$(ADM_LOCALEDIR)'"' \ |
50 | - -IADM_lavutil |
51 | + -IADM_lavutil \ |
52 | + $(TWOLAME_CFLAGS) |
53 | |
54 | # the library search path. |
55 | avidemux2_LDFLAGS = $(all_libraries) $(SDL_LIBS) $(GTK_LIBS) \ |
56 | - $(FREETYPE_LIBS) $(FC_LIBS) $(ARTS_LIBS) $(XML_LIBS) |
57 | + $(FREETYPE_LIBS) $(FC_LIBS) $(ARTS_LIBS) $(XML_LIBS) |
58 | |
59 | noinst_HEADERS = ADM_pp.h admmangle.h |
60 | AM_CFLAGS = -g |
61 | diff -u -r avidemux_2.3.0.old/configure.in avidemux_2.3.0/configure.in |
62 | --- avidemux_2.3.0.old/configure.in 2007-02-03 23:41:05.000000000 +0100 |
63 | +++ avidemux_2.3.0/configure.in 2007-02-03 23:42:56.000000000 +0100 |
64 | @@ -165,6 +165,7 @@ |
65 | AC_SUBST(CCAS) |
66 | AC_SUBST(CCASFLAGS) |
67 | |
68 | + |
69 | dnl ______________________ |
70 | dnl AC_DEFINE(USE_DIV5,0,[Divx 5]) |
71 | dnl AC_DEFINE(USE_AC3,0,[A52dec]) |
72 | @@ -268,6 +269,34 @@ |
73 | AC_DEFINE(USE_LIBXML2,1,[LibXML2 is available]) |
74 | fi |
75 | |
76 | +dnl ____________TWOLAME____________ |
77 | +AC_ARG_WITH([extern-twolame], |
78 | + AC_HELP_STRING([--without-extern-twolame], [Use builtin TwoLAME library (default: test)]), |
79 | + [with_extern_twolame=${withval}], [with_extern_twolame=test]) |
80 | + |
81 | + |
82 | +if test "x$with_extern_twolame" != "xno"; then |
83 | + PKG_CHECK_MODULES(TWOLAME, twolame >= 0.3.6, have_twolame=external, |
84 | + AC_MSG_ERROR([*** need twolame v0.3.6 or greater ! ***])) |
85 | + |
86 | + TWOLAME_VERSION=`$PKG_CONFIG twolame --modversion` |
87 | + TWOLAME_DIR="" |
88 | +else |
89 | + have_twolame=builtin |
90 | + TWOLAME_VERSION=0.3.6 |
91 | + TWOLAME_LIBS=./libtoolame/liblibtoolame.a |
92 | + TWOLAME_CFLAGS= |
93 | + TWOLAME_DIR=libtoolame |
94 | +fi |
95 | + |
96 | +AC_MSG_CHECKING([which twolame support]) |
97 | +AC_MSG_RESULT($have_twolame) |
98 | + |
99 | +AC_SUBST(TWOLAME_CFLAGS) |
100 | +AC_SUBST(TWOLAME_LIBS) |
101 | +AC_SUBST(TWOLAME_VERSION) |
102 | +AC_SUBST(TWOLAME_DIR) |
103 | + |
104 | |
105 | dnl __________________divx______________ |
106 | dnl __________________x264 ______________ |
107 | @@ -1392,6 +1421,8 @@ |
108 | AC_OUTPUT |
109 | dnl ** mean *** |
110 | echo " GTK+ version : $GTK_VERSION" |
111 | +echo " TwoLAME support : $have_twolame" |
112 | +echo " TwoLAME version : $TWOLAME_VERSION" |
113 | echo " Divx5.0.5 ? : $have_divx" |
114 | echo " *** DISABLED ***" |
115 | echo " Xvid 0.9 Codec : $have_xx_xvid" |